3.14-stable patches

added patches:
	nfs-don-t-create-zero-length-requests.patch

diff --git a/queue-3.14/nfs-don-t-create-zero-length-requests.patch b/queue-3.14/nfs-don-t-create-zero-length-requests.patch
new file mode 100644 (file)
index 0000000..8940754
--- /dev/null
+++ b/queue-3.14/nfs-don-t-create-zero-length-requests.patch
@@ -0,0 +1,44 @@
+From 149a4fddd0a72d526abbeac0c8deaab03559836a Mon Sep 17 00:00:00 2001
+From: Benjamin Coddington <bcodding@redhat.com>
+Date: Mon, 18 Jul 2016 10:41:57 -0400
+Subject: nfs: don't create zero-length requests
+
+From: Benjamin Coddington <bcodding@redhat.com>
+
+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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ fs/nfs/write.c |    5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+--- a/fs/nfs/write.c
++++ b/fs/nfs/write.c
+@@ -965,6 +965,9 @@ int nfs_updatepage(struct file *file, st
+       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;
+@@ -975,7 +978,7 @@ int nfs_updatepage(struct file *file, st
+               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;

diff --git a/queue-3.14/series b/queue-3.14/series
index 8574b703e1155f5fe5cccaa7ddf8d58e300beadf..f78f018120578758b7460eea0e3a8e73ce446341 100644 (file)
--- a/queue-3.14/series
+++ b/queue-3.14/series
@@ -17,3 +17,4 @@ mips-kvm-fix-mapped-fault-broken-commpage-handling.patch
 mips-kvm-add-missing-gfn-range-check.patch
 mips-kvm-fix-gfn-range-check-in-kseg0-tlb-faults.patch
 mips-kvm-propagate-kseg0-mapped-tlb-fault-errors.patch
+nfs-don-t-create-zero-length-requests.patch