From 7fc77058bb6b21202a48ca8b5b3c1ba4e93c95bd Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Fri, 23 Nov 2018 15:02:09 -0500 Subject: [PATCH] patches for 4.19 Signed-off-by: Sasha Levin --- queue-4.19/series | 1 + ...tless-static-qualifier-in-xdr_get_ne.patch | 35 +++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 queue-4.19/sunrpc-drop-pointless-static-qualifier-in-xdr_get_ne.patch diff --git a/queue-4.19/series b/queue-4.19/series index 81dd288dfe5..c965493b2f9 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -88,3 +88,4 @@ net-aquantia-fixed-enable-unicast-on-32-macvlan.patch net-aquantia-invalid-checksumm-offload-implementatio.patch kbuild-deb-pkg-fix-too-low-build-version-number.patch revert-scripts-setlocalversion-git-make-dirty-check-.patch +sunrpc-drop-pointless-static-qualifier-in-xdr_get_ne.patch diff --git a/queue-4.19/sunrpc-drop-pointless-static-qualifier-in-xdr_get_ne.patch b/queue-4.19/sunrpc-drop-pointless-static-qualifier-in-xdr_get_ne.patch new file mode 100644 index 00000000000..fcbc35032ff --- /dev/null +++ b/queue-4.19/sunrpc-drop-pointless-static-qualifier-in-xdr_get_ne.patch @@ -0,0 +1,35 @@ +From 81cffa1f34d7153ac5871ff36c3a5c69995d2f8f Mon Sep 17 00:00:00 2001 +From: YueHaibing +Date: Thu, 8 Nov 2018 02:04:57 +0000 +Subject: SUNRPC: drop pointless static qualifier in + xdr_get_next_encode_buffer() + +[ Upstream commit 025911a5f4e36955498ed50806ad1b02f0f76288 ] + +There is no need to have the '__be32 *p' variable static since new value +always be assigned before use it. + +Signed-off-by: YueHaibing +Cc: stable@vger.kernel.org +Signed-off-by: J. Bruce Fields +Signed-off-by: Sasha Levin +--- + net/sunrpc/xdr.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/net/sunrpc/xdr.c b/net/sunrpc/xdr.c +index b53cc0960b5d..ac16f509c95c 100644 +--- a/net/sunrpc/xdr.c ++++ b/net/sunrpc/xdr.c +@@ -512,7 +512,7 @@ EXPORT_SYMBOL_GPL(xdr_commit_encode); + static __be32 *xdr_get_next_encode_buffer(struct xdr_stream *xdr, + size_t nbytes) + { +- static __be32 *p; ++ __be32 *p; + int space_left; + int frag1bytes, frag2bytes; + +-- +2.17.1 + -- 2.47.3