Ksawlii/kernel_samsung_a53x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nfsd: move fsnotify on client creation outside spinlock

Browse source 
[ Upstream commit 934bd07fae7e55232845f909f78873ab8678ca74 ]

This was causing a "sleeping function called from invalid context"
warning.

I don't think we need the set_and_test_bit() here; clients move from
unconfirmed to confirmed only once, under the client_lock.

The (conf == unconf) is a way to check whether we're in that confirming
case, hopefully that's not too obscure.

Fixes: 472d155a0631 "nfsd: report client confirmation status in "info" file"
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
J. Bruce Fields 2021-05-25 14:53:44 -04:00 • committed by Ksawlii
parent f4a7792d92
commit 652addab0d
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
fs/nfsd/nfs4state.c
View file

@ -2846,11 +2846,8 @@ move_to_confirmed(struct nfs4_client *clp)
list_move(&clp->cl_idhash, &nn->conf_id_hashtbl[idhashval]); list_move(&clp->cl_idhash, &nn->conf_id_hashtbl[idhashval]);
rb_erase(&clp->cl_namenode, &nn->unconf_name_tree); rb_erase(&clp->cl_namenode, &nn->unconf_name_tree);
add_clp_to_name_tree(clp, &nn->conf_name_tree); add_clp_to_name_tree(clp, &nn->conf_name_tree);
if (!test_and_set_bit(NFSD4_CLIENT_CONFIRMED, &clp->cl_flags)) { set_bit(NFSD4_CLIENT_CONFIRMED, &clp->cl_flags);
trace_nfsd_clid_confirmed(&clp->cl_clientid); trace_nfsd_clid_confirmed(&clp->cl_clientid);
if (clp->cl_nfsd_dentry && clp->cl_nfsd_info_dentry)
fsnotify_dentry(clp->cl_nfsd_info_dentry, FS_MODIFY);
}
renew_client_locked(clp); renew_client_locked(clp);
} }
@ -3509,6 +3506,8 @@ nfsd4_create_session(struct svc_rqst *rqstp,
/* cache solo and embedded create sessions under the client_lock */ /* cache solo and embedded create sessions under the client_lock */
nfsd4_cache_create_session(cr_ses, cs_slot, status); nfsd4_cache_create_session(cr_ses, cs_slot, status);
spin_unlock(&nn->client_lock); spin_unlock(&nn->client_lock);
if (conf == unconf)
fsnotify_dentry(conf->cl_nfsd_info_dentry, FS_MODIFY);
/* init connection and backchannel */ /* init connection and backchannel */
nfsd4_init_conn(rqstp, conn, new); nfsd4_init_conn(rqstp, conn, new);
nfsd4_put_session(new); nfsd4_put_session(new);
@ -4129,6 +4128,8 @@ nfsd4_setclientid_confirm(struct svc_rqst *rqstp,
} }
get_client_locked(conf); get_client_locked(conf);
spin_unlock(&nn->client_lock); spin_unlock(&nn->client_lock);
if (conf == unconf)
fsnotify_dentry(conf->cl_nfsd_info_dentry, FS_MODIFY);
nfsd4_probe_callback(conf); nfsd4_probe_callback(conf);
spin_lock(&nn->client_lock); spin_lock(&nn->client_lock);
put_client_renew_locked(conf); put_client_renew_locked(conf);