diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2015-10-15 22:11:01 +0200 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2015-10-23 21:57:31 +0200 |
| commit | 4eaea13425078272895ec37814c6878d78b8db9f (patch) | |
| tree | a24bbc91aac3af627870e62b998218951e9a1c71 /fs/nfsd | |
| parent | nfsd: fix clid_inuse on mount with security change (diff) | |
| download | linux-4eaea13425078272895ec37814c6878d78b8db9f.tar.xz linux-4eaea13425078272895ec37814c6878d78b8db9f.zip | |
nfsd: improve client_has_state to check for unused openowners
At least in the v4.0 case openowners can hang around for a while after
last close, but they shouldn't really block (for example), a new mount
with a different principal.
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd')
| -rw-r--r-- | fs/nfsd/nfs4state.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index bac6207191d5..f2ea343086b8 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -2256,16 +2256,20 @@ nfsd4_set_ex_flags(struct nfs4_client *new, struct nfsd4_exchange_id *clid) clid->flags = new->cl_exchange_flags; } +static bool client_has_openowners(struct nfs4_client *clp) +{ + struct nfs4_openowner *oo; + + list_for_each_entry(oo, &clp->cl_openowners, oo_perclient) { + if (!list_empty(&oo->oo_owner.so_stateids)) + return true; + } + return false; +} + static bool client_has_state(struct nfs4_client *clp) { - /* - * Note clp->cl_openowners check isn't quite right: there's no - * need to count owners without stateid's. - * - * Also note in 4.0 case should also be checking for openowners - * kept around just for close handling. - */ - return !list_empty(&clp->cl_openowners) + return client_has_openowners(clp) #ifdef CONFIG_NFSD_PNFS || !list_empty(&clp->cl_lo_states) #endif |