diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2020-06-23 16:00:33 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2020-06-29 14:48:02 -0400 |
| commit | 681370f4b00af0fcc65bbfb9f82de526ab7ceb0a (patch) | |
| tree | f9b3be891505d9420ca222fc14452bb7750315f5 /fs/nfsd/nfs4state.c | |
| parent | 22cf8419f1319ff87ec759d0ebdff4cbafaee832 (diff) | |
| download | linux-stable-681370f4b00af0fcc65bbfb9f82de526ab7ceb0a.tar.gz linux-stable-681370f4b00af0fcc65bbfb9f82de526ab7ceb0a.tar.bz2 linux-stable-681370f4b00af0fcc65bbfb9f82de526ab7ceb0a.zip | |
nfsd4: fix nfsdfs reference count loop
We don't drop the reference on the nfsdfs filesystem with
mntput(nn->nfsd_mnt) until nfsd_exit_net(), but that won't be called
until the nfsd module's unloaded, and we can't unload the module as long
as there's a reference on nfsdfs. So this prevents module unloading.
Fixes: 2c830dd7209b ("nfsd: persist nfsd filesystem across mounts")
Reported-and-Tested-by: Luo Xiaogang <lxgrxd@163.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd/nfs4state.c')
| -rw-r--r-- | fs/nfsd/nfs4state.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index bb3d2c32664a..cce2510b2cca 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -7912,9 +7912,14 @@ nfs4_state_start_net(struct net *net) struct nfsd_net *nn = net_generic(net, nfsd_net_id); int ret; - ret = nfs4_state_create_net(net); + ret = get_nfsdfs(net); if (ret) return ret; + ret = nfs4_state_create_net(net); + if (ret) { + mntput(nn->nfsd_mnt); + return ret; + } locks_start_grace(net, &nn->nfsd4_manager); nfsd4_client_tracking_init(net); if (nn->track_reclaim_completes && nn->reclaim_str_hashtbl_size == 0) @@ -7984,6 +7989,7 @@ nfs4_state_shutdown_net(struct net *net) nfsd4_client_tracking_exit(net); nfs4_state_destroy_net(net); + mntput(nn->nfsd_mnt); } void |