Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit e5eb7f202b7a1a2d20a0b9866805314bf6464fd0

Authored by Lachlan McIlroy
Committed by Tim Shimmin
1 parent 03135cf726
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[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>

Showing 2 changed files with 3 additions and 3 deletions Side-by-side Diff

fs/xfs/linux-2.6/xfs_ioctl.c
Diff comments   View file @ e5eb7f2
... ... @@ -388,7 +388,7 @@
388 388 aiov.iov_len = olen;
389 389 aiov.iov_base = hreq.ohandle;
390 390  
391   - auio.uio_iov = &aiov;
  391 + auio.uio_iov = (struct kvec *)&aiov;
392 392 auio.uio_iovcnt = 1;
393 393 auio.uio_offset = 0;
394 394 auio.uio_segflg = UIO_USERSPACE;
fs/xfs/support/move.h
Diff comments   View file @ e5eb7f2
... ... @@ -55,7 +55,7 @@
55 55 };
56 56  
57 57 struct uio {
58   - struct iovec *uio_iov; /* pointer to array of iovecs */
  58 + struct kvec *uio_iov; /* pointer to array of iovecs */
59 59 int uio_iovcnt; /* number of iovecs in array */
60 60 xfs_off_t uio_offset; /* offset in file this uio corresponds to */
61 61 int uio_resid; /* residual i/o count */
... ... @@ -63,7 +63,7 @@
63 63 };
64 64  
65 65 typedef struct uio uio_t;
66   -typedef struct iovec iovec_t;
  66 +typedef struct kvec iovec_t;
67 67  
68 68 extern int xfs_uio_read (caddr_t, size_t, uio_t *);
69 69