Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 149a4fdd authored by Benjamin Coddington's avatar Benjamin Coddington Committed by Trond Myklebust
Browse files

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: default avatarBenjamin Coddington <bcodding@redhat.com>
Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Reviewed-by: default avatarWeston Andros Adamson <dros@primarydata.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent ffb6ca33
Loading
Loading
Loading
Loading
+4 −1
Original line number Diff line number Diff line
@@ -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;