summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2020-08-21 14:26:26 -0400
committerPaul Gortmaker <paul.gortmaker@windriver.com>2020-08-21 14:26:26 -0400
commitcdaa0a898d24a05d15037610bd82293ed805fa5b (patch)
tree7b670c40cad42c77ddc76f891bf47a7ed8fc155b
parentd6654b65d00ca5d3a8326ea84c08389aa0a9b7f1 (diff)
downloadlongterm-queue-5.2-cdaa0a898d24a05d15037610bd82293ed805fa5b.tar.gz
sunrpc: use v5.4.x-stable version to fix header compile issue
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-rw-r--r--queue/sunrpc-check-that-domain-table-is-empty-at-module-un.patch9
1 files changed, 6 insertions, 3 deletions
diff --git a/queue/sunrpc-check-that-domain-table-is-empty-at-module-un.patch b/queue/sunrpc-check-that-domain-table-is-empty-at-module-un.patch
index 58d177e8..dc9bbae2 100644
--- a/queue/sunrpc-check-that-domain-table-is-empty-at-module-un.patch
+++ b/queue/sunrpc-check-that-domain-table-is-empty-at-module-un.patch
@@ -11,6 +11,7 @@ a bug somewhere. So check and report.
Link: https://bugzilla.kernel.org/show_bug.cgi?id=206651
Signed-off-by: NeilBrown <neilb@suse.de>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/net/sunrpc/sunrpc.h b/net/sunrpc/sunrpc.h
@@ -44,19 +45,21 @@ index f9edaa9174a4..236fadc4a439 100644
rpc_unregister_sysctl();
#endif
diff --git a/net/sunrpc/svcauth.c b/net/sunrpc/svcauth.c
-index 550b214cb001..bfbbeb2acb80 100644
+index 550b214cb001..998b196b6176 100644
--- a/net/sunrpc/svcauth.c
+++ b/net/sunrpc/svcauth.c
-@@ -19,6 +19,8 @@
+@@ -19,6 +19,10 @@
#include <linux/err.h>
#include <linux/hash.h>
++#include <trace/events/sunrpc.h>
++
+#include "sunrpc.h"
+
#define RPCDBG_FACILITY RPCDBG_AUTH
-@@ -203,3 +205,26 @@ struct auth_domain *auth_domain_find(char *name)
+@@ -203,3 +207,26 @@ struct auth_domain *auth_domain_find(char *name)
return NULL;
}
EXPORT_SYMBOL_GPL(auth_domain_find);