diff options
| author | Benjamin Coddington <bcodding@redhat.com> | 2016-07-18 10:41:57 -0400 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2016-08-19 09:51:16 +0200 |
| commit | 4c81fa37349757cc1c32ef261ab187ed43e72d1e (patch) | |
| tree | b19b5e5d46f4f8501788d6293cf5e1859fd130ca /fs | |
| parent | 6c1ff19426bed544da5e0ee7be56c7f52a330e44 (diff) | |
| download | lwn-4c81fa37349757cc1c32ef261ab187ed43e72d1e.tar.gz lwn-4c81fa37349757cc1c32ef261ab187ed43e72d1e.zip | |
nfs: don't create zero-length requests
commit 149a4fddd0a72d526abbeac0c8deaab03559836a upstream.
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>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nfs/write.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/nfs/write.c b/fs/nfs/write.c index 3a1b1d1a27ce..d194a72b5b66 100644 --- a/fs/nfs/write.c +++ b/fs/nfs/write.c @@ -967,6 +967,9 @@ int nfs_updatepage(struct file *file, struct page *page, file->f_path.dentry->d_name.name, 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; @@ -977,7 +980,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; |