---

yaml --- r: 47841 b: refs/heads/master c: e5eb7f2 h: refs/heads/master i: 47839: 0d982f3 v: v3
git-mirror · Feb 10, 2007 · 2e7351a · 2e7351a
1 parent 8f5e272
commit 2e7351a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 03135cf72621fccab57728f0ba3ab5a551df1cc1
+refs/heads/master: e5eb7f202b7a1a2d20a0b9866805314bf6464fd0
diff --git a/trunk/fs/xfs/linux-2.6/xfs_ioctl.c b/trunk/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/trunk/fs/xfs/support/move.h b/trunk/fs/xfs/support/move.h
@@ -55,15 +55,15 @@ 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 */
 	enum uio_seg	uio_segflg; /* see above */
 };
 
 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 *);