[XFS] use struct kvec in struct uio

SGI-PV: 954580
SGI-Modid: xfs-linux-melb:xfs-kern:27701a

Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
Signed-off-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Tim Shimmin <tes@sgi.com>

diff --git a/fs/xfs/linux-2.6/xfs_ioctl.c b/fs/xfs/linux-2.6/xfs_ioctl.c
index f011c9cd0d6211b3635661d3f76a6125c70b53e7..249375274d3f1224cfd6bfda1edf92a1f74dd0f1 100644 (file)
--- a/fs/xfs/linux-2.6/xfs_ioctl.c
+++ b/fs/xfs/linux-2.6/xfs_ioctl.c
@@ -388,7 +388,7 @@ xfs_readlink_by_handle(
        aiov.iov_len    = olen;
        aiov.iov_base   = hreq.ohandle;
 
-       auio.uio_iov    = &aiov;
+       auio.uio_iov    = (struct kvec *)&aiov;
        auio.uio_iovcnt = 1;
        auio.uio_offset = 0;
        auio.uio_segflg = UIO_USERSPACE;

diff --git a/fs/xfs/support/move.h b/fs/xfs/support/move.h
index 977879c24ff527b4a8e5d6062027d2747559278b..324e413deadd5a2b52bcf71249546fcd1e7ad692 100644 (file)
--- a/fs/xfs/support/move.h
+++ b/fs/xfs/support/move.h
@@ -55,7 +55,7 @@ enum uio_seg {
 };
 
 struct uio {
-       struct iovec    *uio_iov;   /* pointer to array of iovecs */
+       struct kvec     *uio_iov;   /* pointer to array of iovecs */
        int             uio_iovcnt; /* number of iovecs in array */
        xfs_off_t       uio_offset; /* offset in file this uio corresponds to */
        int             uio_resid;  /* residual i/o count */
@@ -63,7 +63,7 @@ struct uio {
 };
 
 typedef struct uio uio_t;
-typedef struct iovec iovec_t;
+typedef struct kvec iovec_t;
 
 extern int     xfs_uio_read (caddr_t, size_t, uio_t *);