diff options
author | Peng Tao <tao.peng@primarydata.com> | 2015-01-20 11:20:11 -0500 |
---|---|---|
committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2015-03-13 09:05:25 -0400 |
commit | 2854475f6c612d59901d51c358abd05643278b53 (patch) | |
tree | 40b89df67f9f04b080ba4fdd553cbcfbcea99009 | |
parent | 55cc1d7806cd4827d38a18ddf3bcf04706758218 (diff) |
nfs: clean up nfs_direct_IO
This follows up "nfs: fix dio deadlock when O_DIRECT flag is flipped"
and removes the unnecessary CONFIG_NFS_SWAP switch.
Signed-off-by: Peng Tao <tao.peng@primarydata.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
-rw-r--r-- | fs/nfs/direct.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c index e907c8cf732e..51f617e45fd1 100644 --- a/fs/nfs/direct.c +++ b/fs/nfs/direct.c | |||
@@ -259,18 +259,11 @@ ssize_t nfs_direct_IO(int rw, struct kiocb *iocb, struct iov_iter *iter, loff_t | |||
259 | if (!IS_SWAPFILE(inode)) | 259 | if (!IS_SWAPFILE(inode)) |
260 | return 0; | 260 | return 0; |
261 | 261 | ||
262 | #ifndef CONFIG_NFS_SWAP | ||
263 | dprintk("NFS: nfs_direct_IO (%pD) off/no(%Ld/%lu) EINVAL\n", | ||
264 | iocb->ki_filp, (long long) pos, iter->nr_segs); | ||
265 | |||
266 | return -EINVAL; | ||
267 | #else | ||
268 | VM_BUG_ON(iocb->ki_nbytes != PAGE_SIZE); | 262 | VM_BUG_ON(iocb->ki_nbytes != PAGE_SIZE); |
269 | 263 | ||
270 | if (rw == READ) | 264 | if (rw == READ) |
271 | return nfs_file_direct_read(iocb, iter, pos); | 265 | return nfs_file_direct_read(iocb, iter, pos); |
272 | return nfs_file_direct_write(iocb, iter, pos); | 266 | return nfs_file_direct_write(iocb, iter, pos); |
273 | #endif /* CONFIG_NFS_SWAP */ | ||
274 | } | 267 | } |
275 | 268 | ||
276 | static void nfs_direct_release_pages(struct page **pages, unsigned int npages) | 269 | static void nfs_direct_release_pages(struct page **pages, unsigned int npages) |