diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2020-09-25 10:12:39 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2020-09-25 18:02:03 -0400 |
| commit | 13956160fc7c75706178cb05c0ac9f5ca77c6411 (patch) | |
| tree | 7768e8655a00f6abc441e12300d5b2567ed140d6 /fs/nfsd | |
| parent | 50747dd5e47bde3b7d7f839c84d0d3b554090497 (diff) | |
| download | linux-stable-13956160fc7c75706178cb05c0ac9f5ca77c6411.tar.gz linux-stable-13956160fc7c75706178cb05c0ac9f5ca77c6411.tar.bz2 linux-stable-13956160fc7c75706178cb05c0ac9f5ca77c6411.zip | |
nfsd: rq_lease_breaker cleanup
Since only the v4 code cares about it, maybe it's better to leave
rq_lease_breaker out of the common dispatch code?
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd')
| -rw-r--r-- | fs/nfsd/nfs4state.c | 3 | ||||
| -rw-r--r-- | fs/nfsd/nfssvc.c | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index a59551efd263..4f3964582b68 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -4598,7 +4598,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) + /* Note rq_prog == NFS_ACL_PROGRAM is also possible: */ + if (rqst->rq_prog != NFS_PROGRAM || rqst->rq_vers < 4) return NULL; clp = *(rqst->rq_lease_breaker); return dl->dl_stid.sc_client == clp; diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c index f7f6473578af..f6bc94cab9da 100644 --- a/fs/nfsd/nfssvc.c +++ b/fs/nfsd/nfssvc.c @@ -1016,7 +1016,6 @@ nfsd_dispatch(struct svc_rqst *rqstp, __be32 *statp) *statp = rpc_garbage_args; return 1; } - rqstp->rq_lease_breaker = NULL; /* * Give the xdr decoder a chance to change this if it wants * (necessary in the NFSv4.0 compound case) |