]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[XFS] rename uio_read() to xfs_uio_read()
authorVlad Apostolov <vapo@sgi.com>
Sat, 11 Nov 2006 07:04:41 +0000 (18:04 +1100)
committerTim Shimmin <tes@sgi.com>
Sat, 11 Nov 2006 07:04:41 +0000 (18:04 +1100)
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>
fs/xfs/support/move.c
fs/xfs/support/move.h
fs/xfs/xfs_dir2.c
fs/xfs/xfs_vnodeops.c

index caefa17b80feafedbfa2aefa5b2b9b38d7fda0bd..ac8617ca3909a27ca620984e4c81280e009568c5 100644 (file)
@@ -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;
 
index 97a2498d2da383230154e5cdd4e961728e3ae8cc..977879c24ff527b4a8e5d6062027d2747559278b 100644 (file)
@@ -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__ */
index 8edbe1adb95ba64b1ae75e135a9828ca43a3b0e8..8e8e5279334a47953fa7922e6e14ed8422bc4186 100644 (file)
@@ -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;
 }
index 061e2ffdd1dee3613bedb671dbdbb9256350aac8..2c79c367058929ae18cd289c639efe20d2134133 100644 (file)
@@ -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);
                }