[XFS] rename uio_read() to xfs_uio_read()

SGI-PV: 957004
SGI-Modid: xfs-linux-melb:xfs-kern:27231a

Signed-off-by: Vlad Apostolov <vapo@sgi.com>
Signed-off-by: Tim Shimmin <tes@sgi.com>

authored by Vlad Apostolov and committed by Tim Shimmin 70a50528 439b8434

+5 -5
+1 -1
fs/xfs/support/move.c
··· 22 * as we go. 23 */ 24 int 25 - uio_read(caddr_t src, size_t len, struct uio *uio) 26 { 27 size_t count; 28
··· 22 * as we go. 23 */ 24 int 25 + xfs_uio_read(caddr_t src, size_t len, struct uio *uio) 26 { 27 size_t count; 28
+1 -1
fs/xfs/support/move.h
··· 65 typedef struct uio uio_t; 66 typedef struct iovec iovec_t; 67 68 - extern int uio_read (caddr_t, size_t, uio_t *); 69 70 #endif /* __XFS_SUPPORT_MOVE_H__ */
··· 65 typedef struct uio uio_t; 66 typedef struct iovec iovec_t; 67 68 + extern int xfs_uio_read (caddr_t, size_t, uio_t *); 69 70 #endif /* __XFS_SUPPORT_MOVE_H__ */
+1 -1
fs/xfs/xfs_dir2.c
··· 678 idbp->d_off = pa->cook; 679 idbp->d_name[namelen] = '\0'; 680 memcpy(idbp->d_name, pa->name, namelen); 681 - rval = uio_read((caddr_t)idbp, reclen, uio); 682 pa->done = (rval == 0); 683 return rval; 684 }
··· 678 idbp->d_off = pa->cook; 679 idbp->d_name[namelen] = '\0'; 680 memcpy(idbp->d_name, pa->name, namelen); 681 + rval = xfs_uio_read((caddr_t)idbp, reclen, uio); 682 pa->done = (rval == 0); 683 return rval; 684 }
+2 -2
fs/xfs/xfs_vnodeops.c
··· 1013 pathlen = (int)ip->i_d.di_size; 1014 1015 if (ip->i_df.if_flags & XFS_IFINLINE) { 1016 - error = uio_read(ip->i_df.if_u1.if_data, pathlen, uiop); 1017 } 1018 else { 1019 /* ··· 1044 byte_cnt = pathlen; 1045 pathlen -= byte_cnt; 1046 1047 - error = uio_read(XFS_BUF_PTR(bp), byte_cnt, uiop); 1048 xfs_buf_relse (bp); 1049 } 1050
··· 1013 pathlen = (int)ip->i_d.di_size; 1014 1015 if (ip->i_df.if_flags & XFS_IFINLINE) { 1016 + error = xfs_uio_read(ip->i_df.if_u1.if_data, pathlen, uiop); 1017 } 1018 else { 1019 /* ··· 1044 byte_cnt = pathlen; 1045 pathlen -= byte_cnt; 1046 1047 + error = xfs_uio_read(XFS_BUF_PTR(bp), byte_cnt, uiop); 1048 xfs_buf_relse (bp); 1049 } 1050