xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nfsd: don't destroy clients that are busy

Browse Source 
It's possible that we'll have an in-progress call on some of the clients
while a rogue EXCHANGE_ID or DESTROY_CLIENTID call comes in. Be sure to
try and mark the client expired first, so that the refcount is
respected.

This will only be a problem once the client_mutex is removed.

Signed-off-by: Jeff Layton <jlayton@primarydata.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
Jeff Layton
2014-07-30 08:27:14 -04:00
committed by J. Bruce Fields
parent fb94d766af
commit fd699b8a48
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
fs/nfsd/nfs4state.c
View File

@@ -2267,8 +2267,11 @@ nfsd4_exchange_id(struct svc_rqst *rqstp,
/* case 1 (normal case) */ /* case 1 (normal case) */
out_new: out_new:
if (conf) if (conf) {
unhash_client_locked(conf); status = mark_client_expired_locked(conf);
if (status)
goto out;
}
new->cl_minorversion = cstate->minorversion; new->cl_minorversion = cstate->minorversion;
new->cl_mach_cred = (exid->spa_how == SP4_MACH_CRED); new->cl_mach_cred = (exid->spa_how == SP4_MACH_CRED);
@@ -2881,6 +2884,9 @@ nfsd4_destroy_clientid(struct svc_rqst *rqstp, struct nfsd4_compound_state *csta
status = nfserr_clientid_busy; status = nfserr_clientid_busy;
goto out; goto out;
} }
status = mark_client_expired_locked(conf);
if (status)
goto out;
clp = conf; clp = conf;
} else if (unconf) } else if (unconf)
clp = unconf; clp = unconf;