summaryrefslogtreecommitdiff
path: root/fs/nfs/write.c
diff options
context:
space:
mode:
authorBenjamin Coddington <bcodding@redhat.com>2016-07-18 17:41:57 +0300
committerTrond Myklebust <trond.myklebust@primarydata.com>2016-07-22 22:15:16 +0300
commit149a4fddd0a72d526abbeac0c8deaab03559836a (patch)
tree35053c2b2c5d4ab4ed49c27a7cfdadbcf70f39a1 /fs/nfs/write.c
parentffb6ca33b04b965ac7dd10676537b93e2476dcec (diff)
downloadlinux-149a4fddd0a72d526abbeac0c8deaab03559836a.tar.xz
nfs: don't create zero-length requests
NFS doesn't expect requests with wb_bytes set to zero and may make unexpected decisions about how to handle that request at the page IO layer. Skip request creation if we won't have any wb_bytes in the request. Signed-off-by: Benjamin Coddington <bcodding@redhat.com> Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Reviewed-by: Weston Andros Adamson <dros@primarydata.com> Cc: stable@vger.kernel.org Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Diffstat (limited to 'fs/nfs/write.c')
-rw-r--r--fs/nfs/write.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index 0b949a06b297..b5f3da346f1d 100644
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -1291,6 +1291,9 @@ int nfs_updatepage(struct file *file, struct page *page,
dprintk("NFS: nfs_updatepage(%pD2 %d@%lld)\n",
file, count, (long long)(page_file_offset(page) + offset));
+ if (!count)
+ goto out;
+
if (nfs_can_extend_write(file, page, inode)) {
count = max(count + offset, nfs_page_length(page));
offset = 0;
@@ -1301,7 +1304,7 @@ int nfs_updatepage(struct file *file, struct page *page,
nfs_set_pageerror(page);
else
__set_page_dirty_nobuffers(page);
-
+out:
dprintk("NFS: nfs_updatepage returns %d (isize %lld)\n",
status, (long long)i_size_read(inode));
return status;