summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2020-08-21 12:42:18 -0400
committerPaul Gortmaker <paul.gortmaker@windriver.com>2020-08-21 12:42:18 -0400
commitbaaf119db5303812a59da9056a3a0857f02bd33b (patch)
tree42b7774320d96b0189383c8fa61fbb3bae5b3ebd
parentfde881de78484cd57887d2d9c295b47f30103e51 (diff)
downloadlongterm-queue-5.2-baaf119db5303812a59da9056a3a0857f02bd33b.tar.gz
sunrpc: ctxt refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-rw-r--r--queue/sunrpc-check-that-domain-table-is-empty-at-module-un.patch16
1 files changed, 8 insertions, 8 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 8192a246..e5d72872 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
@@ -1,4 +1,4 @@
-From f45db2b909c7e76f35850e78f017221f30282b8e Mon Sep 17 00:00:00 2001
+From 968b984d5cda87a29a15f50f83aabba78aa7822a Mon Sep 17 00:00:00 2001
From: NeilBrown <neilb@suse.de>
Date: Fri, 22 May 2020 12:01:32 +1000
Subject: [PATCH] sunrpc: check that domain table is empty at module unload.
@@ -13,10 +13,10 @@ Signed-off-by: NeilBrown <neilb@suse.de>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
diff --git a/net/sunrpc/sunrpc.h b/net/sunrpc/sunrpc.h
-index 47a756503d11..f6fe2e6cd65a 100644
+index c9bacb3c930f..82035fa65b8f 100644
--- a/net/sunrpc/sunrpc.h
+++ b/net/sunrpc/sunrpc.h
-@@ -52,4 +52,5 @@ static inline int sock_is_loopback(struct sock *sk)
+@@ -56,4 +56,5 @@ int svc_send_common(struct socket *sock, struct xdr_buf *xdr,
int rpc_clients_notifier_register(void);
void rpc_clients_notifier_unregister(void);
@@ -43,19 +43,19 @@ index f9edaa9174a4..236fadc4a439 100644
rpc_unregister_sysctl();
#endif
diff --git a/net/sunrpc/svcauth.c b/net/sunrpc/svcauth.c
-index 552617e3467b..998b196b6176 100644
+index 550b214cb001..bfbbeb2acb80 100644
--- a/net/sunrpc/svcauth.c
+++ b/net/sunrpc/svcauth.c
-@@ -21,6 +21,8 @@
-
- #include <trace/events/sunrpc.h>
+@@ -19,6 +19,8 @@
+ #include <linux/err.h>
+ #include <linux/hash.h>
+#include "sunrpc.h"
+
#define RPCDBG_FACILITY RPCDBG_AUTH
-@@ -205,3 +207,26 @@ struct auth_domain *auth_domain_find(char *name)
+@@ -203,3 +205,26 @@ struct auth_domain *auth_domain_find(char *name)
return NULL;
}
EXPORT_SYMBOL_GPL(auth_domain_find);