[xfs-masters] [patch 2/2] xfs: rename uio_read()

[akpm@xxxxxxxx]

From: Andrew Morton <akpm@xxxxxxxx>

To xfs_uio_read().  uio_read() is too generic-sounding, and conflicts with the
user-level IO driver in Greg's tree.

Cc: <xfs-masters@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---

 fs/xfs/support/move.c |    2 +-
 fs/xfs/support/move.h |    2 +-
 fs/xfs/xfs_dir2.c     |    2 +-
 fs/xfs/xfs_vnodeops.c |    4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff -puN fs/xfs/support/move.c~xfs-rename-uio_read fs/xfs/support/move.c
--- a/fs/xfs/support/move.c~xfs-rename-uio_read
+++ a/fs/xfs/support/move.c
@@ -22,7 +22,7 @@
  * as we go.
  */
 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;
 
diff -puN fs/xfs/support/move.h~xfs-rename-uio_read fs/xfs/support/move.h
--- a/fs/xfs/support/move.h~xfs-rename-uio_read
+++ a/fs/xfs/support/move.h
@@ -65,6 +65,6 @@ struct uio {
 typedef struct uio uio_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__ */
diff -puN fs/xfs/xfs_dir2.c~xfs-rename-uio_read fs/xfs/xfs_dir2.c
--- a/fs/xfs/xfs_dir2.c~xfs-rename-uio_read
+++ a/fs/xfs/xfs_dir2.c
@@ -678,7 +678,7 @@ xfs_dir2_put_dirent64_uio(
        idbp->d_off = pa->cook;
        idbp->d_name[namelen] = '\0';
        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);
        return rval;
 }
diff -puN fs/xfs/xfs_vnodeops.c~xfs-rename-uio_read fs/xfs/xfs_vnodeops.c
--- a/fs/xfs/xfs_vnodeops.c~xfs-rename-uio_read
+++ a/fs/xfs/xfs_vnodeops.c
@@ -1013,7 +1013,7 @@ xfs_readlink(
        pathlen = (int)ip->i_d.di_size;
 
        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 {
                /*
@@ -1044,7 +1044,7 @@ xfs_readlink(
                                byte_cnt = pathlen;
                        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);
                }
 
_