Commit 2854475f authored by Peng Tao's avatar Peng Tao Committed by Trond Myklebust
Browse files

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: default avatarPeng Tao <tao.peng@primarydata.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent 55cc1d78

fs/nfs/direct.c

+0 −7
Original line number Diff line number Diff line
@@ -259,18 +259,11 @@ ssize_t nfs_direct_IO(int rw, struct kiocb *iocb, struct iov_iter *iter, loff_t 
	if (!IS_SWAPFILE(inode))

		return 0;



#ifndef CONFIG_NFS_SWAP

	dprintk("NFS: nfs_direct_IO (%pD) off/no(%Ld/%lu) EINVAL\n",

			iocb->ki_filp, (long long) pos, iter->nr_segs);



	return -EINVAL;

#else

	VM_BUG_ON(iocb->ki_nbytes != PAGE_SIZE);



	if (rw == READ)

		return nfs_file_direct_read(iocb, iter, pos);

	return nfs_file_direct_write(iocb, iter, pos);

#endif /* CONFIG_NFS_SWAP */

}



static void nfs_direct_release_pages(struct page **pages, unsigned int npages)