diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-08-25 18:01:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-08-25 18:01:36 -0700 |
| commit | 2ac69819ba9e3d8d550bb5d2d2df74848e556812 (patch) | |
| tree | bf65c47f964a7c0ac74fe2fa05f42ea2219e6228 | |
| parent | abb3438d69fb6dd5baa4ae23eafbf5b87945eff1 (diff) | |
| parent | ad112aa8b1ac4bf5e8da67734fcb535fd3cd564e (diff) | |
| download | linux-visconti-2ac69819ba9e3d8d550bb5d2d2df74848e556812.tar.gz | |
Merge tag 'nfsd-5.9-1' of git://git.linux-nfs.org/projects/cel/cel-2.6
Pull nfs server fixes from Chuck Lever:
- Eliminate an oops introduced in v5.8
- Remove a duplicate #include added by nfsd-5.9
* tag 'nfsd-5.9-1' of git://git.linux-nfs.org/projects/cel/cel-2.6:
SUNRPC: remove duplicate include
nfsd: fix oops on mixed NFSv4/NFSv3 client access
| -rw-r--r-- | fs/nfsd/nfs4state.c | 2 | ||||
| -rw-r--r-- | net/sunrpc/auth_gss/trace.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 49a604b1c6a60f..c09a2a4281ec93 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -4597,6 +4597,8 @@ static bool nfsd_breaker_owns_lease(struct file_lock *fl) if (!i_am_nfsd()) return NULL; rqst = kthread_data(current); + if (!rqst->rq_lease_breaker) + return NULL; clp = *(rqst->rq_lease_breaker); return dl->dl_stid.sc_client == clp; } diff --git a/net/sunrpc/auth_gss/trace.c b/net/sunrpc/auth_gss/trace.c index d26036a5744320..76685abba60fec 100644 --- a/net/sunrpc/auth_gss/trace.c +++ b/net/sunrpc/auth_gss/trace.c @@ -9,7 +9,6 @@ #include <linux/sunrpc/svc_xprt.h> #include <linux/sunrpc/auth_gss.h> #include <linux/sunrpc/gss_err.h> -#include <linux/sunrpc/auth_gss.h> #define CREATE_TRACE_POINTS #include <trace/events/rpcgss.h> |