3.10-stable patches

added patches:
	nfs-fix-size-of-nfsacl-setacl-operations.patch
	watchdog-omap-assert-the-counter-being-stopped-before-reprogramming.patch

diff --git a/queue-3.10/nfs-fix-size-of-nfsacl-setacl-operations.patch b/queue-3.10/nfs-fix-size-of-nfsacl-setacl-operations.patch
new file mode 100644 (file)
index 0000000..2261ee9
--- /dev/null
+++ b/queue-3.10/nfs-fix-size-of-nfsacl-setacl-operations.patch
@@ -0,0 +1,33 @@
+From d683cc49daf7c5afca8cd9654aaa1bf63cdf2ad9 Mon Sep 17 00:00:00 2001
+From: Chuck Lever <chuck.lever@oracle.com>
+Date: Tue, 26 May 2015 11:53:52 -0400
+Subject: NFS: Fix size of NFSACL SETACL operations
+
+From: Chuck Lever <chuck.lever@oracle.com>
+
+commit d683cc49daf7c5afca8cd9654aaa1bf63cdf2ad9 upstream.
+
+When encoding the NFSACL SETACL operation, reserve just the estimated
+size of the ACL rather than a fixed maximum. This eliminates needless
+zero padding on the wire that the server ignores.
+
+Fixes: ee5dc7732bd5 ('NFS: Fix "kernel BUG at fs/nfs/nfs3xdr.c:1338!"')
+Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
+Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ fs/nfs/nfs3xdr.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/fs/nfs/nfs3xdr.c
++++ b/fs/nfs/nfs3xdr.c
+@@ -1342,7 +1342,7 @@ static void nfs3_xdr_enc_setacl3args(str
+       if (args->npages != 0)
+               xdr_write_pages(xdr, args->pages, 0, args->len);
+       else
+-              xdr_reserve_space(xdr, NFS_ACL_INLINE_BUFSIZE);
++              xdr_reserve_space(xdr, args->len);
+ 
+       error = nfsacl_encode(xdr->buf, base, args->inode,
+                           (args->mask & NFS_ACL) ?

diff --git a/queue-3.10/series b/queue-3.10/series
index 4c082e143349bf68ddd29239c12a629da08d10e0..613ee941fbf95a07930a9e850721cafd4fe195e4 100644 (file)
--- a/queue-3.10/series
+++ b/queue-3.10/series
@@ -74,3 +74,5 @@ mmc-card-fixup-request-missing-in-mmc_blk_issue_rw_rq.patch
 __bitmap_parselist-fix-bug-in-empty-string-handling.patch
 mac80211-prevent-possible-crypto-tx-tailroom-corruption.patch
 usb-usbfs-allow-urbs-to-be-reaped-after-disconnection.patch
+watchdog-omap-assert-the-counter-being-stopped-before-reprogramming.patch
+nfs-fix-size-of-nfsacl-setacl-operations.patch

diff --git a/queue-3.10/watchdog-omap-assert-the-counter-being-stopped-before-reprogramming.patch b/queue-3.10/watchdog-omap-assert-the-counter-being-stopped-before-reprogramming.patch
new file mode 100644 (file)
index 0000000..af29fa1
--- /dev/null
+++ b/queue-3.10/watchdog-omap-assert-the-counter-being-stopped-before-reprogramming.patch
@@ -0,0 +1,61 @@
+From 530c11d432727c697629ad5f9d00ee8e2864d453 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de>
+Date: Wed, 29 Apr 2015 20:38:46 +0200
+Subject: watchdog: omap: assert the counter being stopped before reprogramming
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de>
+
+commit 530c11d432727c697629ad5f9d00ee8e2864d453 upstream.
+
+The omap watchdog has the annoying behaviour that writes to most
+registers don't have any effect when the watchdog is already running.
+Quoting the AM335x reference manual:
+
+       To modify the timer counter value (the WDT_WCRR register),
+       prescaler ratio (the WDT_WCLR[4:2] PTV bit field), delay
+       configuration value (the WDT_WDLY[31:0] DLY_VALUE bit field), or
+       the load value (the WDT_WLDR[31:0] TIMER_LOAD bit field), the
+       watchdog timer must be disabled by using the start/stop sequence
+       (the WDT_WSPR register).
+
+Currently the timer is stopped in the .probe callback but still there
+are possibilities that yield to a situation where omap_wdt_start is
+entered with the timer running (e.g. when /dev/watchdog is closed
+without stopping and then reopened). In such a case programming the
+timeout silently fails!
+
+To circumvent this stop the timer before reprogramming.
+
+Assuming one of the first things the watchdog user does is setting the
+timeout explicitly nothing too bad should happen because this explicit
+setting works fine.
+
+Fixes: 7768a13c252a ("[PATCH] OMAP: Add Watchdog driver support")
+Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
+Reviewed-by: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/watchdog/omap_wdt.c |    7 +++++++
+ 1 file changed, 7 insertions(+)
+
+--- a/drivers/watchdog/omap_wdt.c
++++ b/drivers/watchdog/omap_wdt.c
+@@ -134,6 +134,13 @@ static int omap_wdt_start(struct watchdo
+ 
+       pm_runtime_get_sync(wdev->dev);
+ 
++      /*
++       * Make sure the watchdog is disabled. This is unfortunately required
++       * because writing to various registers with the watchdog running has no
++       * effect.
++       */
++      omap_wdt_disable(wdev);
++
+       /* initialize prescaler */
+       while (__raw_readl(base + OMAP_WATCHDOG_WPS) & 0x01)
+               cpu_relax();