diff options
Diffstat (limited to 'fs/nfs/direct.c')
-rw-r--r-- | fs/nfs/direct.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c index b8797ae6831f..e9cde3935001 100644 --- a/fs/nfs/direct.c +++ b/fs/nfs/direct.c | |||
@@ -121,20 +121,20 @@ static inline int put_dreq(struct nfs_direct_req *dreq) | |||
121 | * shunt off direct read and write requests before the VFS gets them, | 121 | * shunt off direct read and write requests before the VFS gets them, |
122 | * so this method is only ever called for swap. | 122 | * so this method is only ever called for swap. |
123 | */ | 123 | */ |
124 | ssize_t nfs_direct_IO(int rw, struct kiocb *iocb, const struct iovec *iov, loff_t pos, unsigned long nr_segs) | 124 | ssize_t nfs_direct_IO(int rw, struct kiocb *iocb, struct iov_iter *iter, loff_t pos) |
125 | { | 125 | { |
126 | #ifndef CONFIG_NFS_SWAP | 126 | #ifndef CONFIG_NFS_SWAP |
127 | dprintk("NFS: nfs_direct_IO (%pD) off/no(%Ld/%lu) EINVAL\n", | 127 | dprintk("NFS: nfs_direct_IO (%pD) off/no(%Ld/%lu) EINVAL\n", |
128 | iocb->ki_filp, (long long) pos, nr_segs); | 128 | iocb->ki_filp, (long long) pos, iter->nr_segs); |
129 | 129 | ||
130 | return -EINVAL; | 130 | return -EINVAL; |
131 | #else | 131 | #else |
132 | VM_BUG_ON(iocb->ki_nbytes != PAGE_SIZE); | 132 | VM_BUG_ON(iocb->ki_nbytes != PAGE_SIZE); |
133 | 133 | ||
134 | if (rw == READ || rw == KERNEL_READ) | 134 | if (rw == READ || rw == KERNEL_READ) |
135 | return nfs_file_direct_read(iocb, iov, nr_segs, pos, | 135 | return nfs_file_direct_read(iocb, iter->iov, iter->nr_segs, pos, |
136 | rw == READ ? true : false); | 136 | rw == READ ? true : false); |
137 | return nfs_file_direct_write(iocb, iov, nr_segs, pos, | 137 | return nfs_file_direct_write(iocb, iter->iov, iter->nr_segs, pos, |
138 | rw == WRITE ? true : false); | 138 | rw == WRITE ? true : false); |
139 | #endif /* CONFIG_NFS_SWAP */ | 139 | #endif /* CONFIG_NFS_SWAP */ |
140 | } | 140 | } |