leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[XFS] rename uio_read() to xfs_uio_read()

Browse Source 
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>
This commit is contained in:
Vlad Apostolov
2006-11-11 18:04:41 +11:00
committed by Tim Shimmin
parent 439b843479
commit 70a505285f
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fs/xfs/support/move.c
View File

@@ -22,7 +22,7 @@
* as we go. * as we go.
*/ */
int int
uio_read(caddr_t src, size_t len, struct uio *uio) xfs_uio_read(caddr_t src, size_t len, struct uio *uio)
{ {
size_t count; size_t count;

2
fs/xfs/support/move.h
View File

@@ -65,6 +65,6 @@ struct uio {
typedef struct uio uio_t; typedef struct uio uio_t;
typedef struct iovec iovec_t; typedef struct iovec iovec_t;
extern int uio_read (caddr_t, size_t, uio_t *); extern int xfs_uio_read (caddr_t, size_t, uio_t *);
#endif /* __XFS_SUPPORT_MOVE_H__ */ #endif /* __XFS_SUPPORT_MOVE_H__ */

2
fs/xfs/xfs_dir2.c
View File

@@ -678,7 +678,7 @@ xfs_dir2_put_dirent64_uio(
idbp->d_off = pa->cook; idbp->d_off = pa->cook;
idbp->d_name[namelen] = '\0'; idbp->d_name[namelen] = '\0';
memcpy(idbp->d_name, pa->name, namelen); memcpy(idbp->d_name, pa->name, namelen);
rval = uio_read((caddr_t)idbp, reclen, uio); rval = xfs_uio_read((caddr_t)idbp, reclen, uio);
pa->done = (rval == 0); pa->done = (rval == 0);
return rval; return rval;
} }

4
fs/xfs/xfs_vnodeops.c
View File

@@ -1013,7 +1013,7 @@ xfs_readlink(
pathlen = (int)ip->i_d.di_size; pathlen = (int)ip->i_d.di_size;
if (ip->i_df.if_flags & XFS_IFINLINE) { if (ip->i_df.if_flags & XFS_IFINLINE) {
error = uio_read(ip->i_df.if_u1.if_data, pathlen, uiop); error = xfs_uio_read(ip->i_df.if_u1.if_data, pathlen, uiop);
} }
else { else {
/* /*
@@ -1044,7 +1044,7 @@ xfs_readlink(
byte_cnt = pathlen; byte_cnt = pathlen;
pathlen -= byte_cnt; pathlen -= byte_cnt;
error = uio_read(XFS_BUF_PTR(bp), byte_cnt, uiop); error = xfs_uio_read(XFS_BUF_PTR(bp), byte_cnt, uiop);
xfs_buf_relse (bp); xfs_buf_relse (bp);
} }