ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 20:51:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

nfsd: rq_lease_breaker cleanup

Browse Source 
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>
This commit is contained in:
J. Bruce Fields
2020-09-25 10:12:39 -04:00
parent 50747dd5e4
commit 13956160fc
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
fs/nfsd/nfs4state.c
View File

@@ -4598,7 +4598,8 @@ static bool nfsd_breaker_owns_lease(struct file_lock *fl)
if (!i_am_nfsd()) if (!i_am_nfsd())
return NULL; return NULL;
rqst = kthread_data(current); 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; return NULL;
clp = *(rqst->rq_lease_breaker); clp = *(rqst->rq_lease_breaker);
return dl->dl_stid.sc_client == clp; return dl->dl_stid.sc_client == clp;

1
fs/nfsd/nfssvc.c
View File

@@ -1016,7 +1016,6 @@ nfsd_dispatch(struct svc_rqst *rqstp, __be32 *statp)
*statp = rpc_garbage_args; *statp = rpc_garbage_args;
return 1; return 1;
} }
rqstp->rq_lease_breaker = NULL;
/* /*
* Give the xdr decoder a chance to change this if it wants * Give the xdr decoder a chance to change this if it wants
* (necessary in the NFSv4.0 compound case) * (necessary in the NFSv4.0 compound case)