summaryrefslogtreecommitdiff
path: root/fs/nfs/file.c
diff options
context:
space:
mode:
authorTrond Myklebust <trond.myklebust@primarydata.com>2016-06-23 10:35:48 -0400
committerTrond Myklebust <trond.myklebust@primarydata.com>2016-07-05 19:11:03 -0400
commit89698b24d24f9c8b470a73351b0b7199c17e0153 (patch)
tree6d778072da2d0f6d1ed7765cbbc51104e9217376 /fs/nfs/file.c
parent2f3c7d87a347b12f725f6128b3097727b91b230e (diff)
downloadlinux-rpi-89698b24d24f9c8b470a73351b0b7199c17e0153.tar.gz
linux-rpi-89698b24d24f9c8b470a73351b0b7199c17e0153.tar.bz2
linux-rpi-89698b24d24f9c8b470a73351b0b7199c17e0153.zip
NFS Cleanup: move call to generic_write_checks() into fs/nfs/direct.c
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Diffstat (limited to 'fs/nfs/file.c')
-rw-r--r--fs/nfs/file.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/fs/nfs/file.c b/fs/nfs/file.c
index df4dd8e7e62e..c26847c84d00 100644
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@ -629,12 +629,8 @@ ssize_t nfs_file_write(struct kiocb *iocb, struct iov_iter *from)
if (result)
return result;
- if (iocb->ki_flags & IOCB_DIRECT) {
- result = generic_write_checks(iocb, from);
- if (result <= 0)
- return result;
+ if (iocb->ki_flags & IOCB_DIRECT)
return nfs_file_direct_write(iocb, from);
- }
dprintk("NFS: write(%pD2, %zu@%Ld)\n",
file, count, (long long) iocb->ki_pos);