summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-08-25 18:01:36 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2020-08-25 18:01:36 -0700
commit2ac69819ba9e3d8d550bb5d2d2df74848e556812 (patch)
treebf65c47f964a7c0ac74fe2fa05f42ea2219e6228 /fs
parentabb3438d69fb6dd5baa4ae23eafbf5b87945eff1 (diff)
parentad112aa8b1ac4bf5e8da67734fcb535fd3cd564e (diff)
downloadlwn-2ac69819ba9e3d8d550bb5d2d2df74848e556812.tar.gz
lwn-2ac69819ba9e3d8d550bb5d2d2df74848e556812.zip
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
Diffstat (limited to 'fs')
-rw-r--r--fs/nfsd/nfs4state.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 49a604b1c6a6..c09a2a4281ec 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;
}