| Message ID | 165595965412.4786.12578338276708392878@noble.neil.brown.name (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | NFS: restore module put when manager exits. | expand |
> On Jun 23, 2022, at 12:47 AM, NeilBrown <neilb@suse.de> wrote: > > > Commit f49169c97fce ("NFSD: Remove svc_serv_ops::svo_module") removed > calls to module_put_and_kthread_exit() from threads that acted as SUNRPC > servers and had a related svc_serv_ops structure. This was correct. > > It ALSO removed the module_put_and_kthread_exit() call from > nfs4_run_state_manager() which is NOT a SUNRPC service. > > Consequently every time the NFSv4 state manager runs the module count > increments and won't be decremented. So the nfsv4 module cannot be > unloaded. > > So restore the module_put_and_kthread_exit() call. > > Fixes: f49169c97fce ("NFSD: Remove svc_serv_ops::svo_module") > Signed-off-by: NeilBrown <neilb@suse.de> The fix seems correct to me. I can't remember why I thought this particular module_put_and_kthread_exit() call site needed to go. > --- > fs/nfs/nfs4state.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c > index 2540b35ec187..9bab3e9c702a 100644 > --- a/fs/nfs/nfs4state.c > +++ b/fs/nfs/nfs4state.c > @@ -2753,5 +2753,6 @@ static int nfs4_run_state_manager(void *ptr) > goto again; > > nfs_put_client(clp); > + module_put_and_kthread_exit(0); > return 0; > } > -- > 2.36.1 > -- Chuck Lever
diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c index 2540b35ec187..9bab3e9c702a 100644 --- a/fs/nfs/nfs4state.c +++ b/fs/nfs/nfs4state.c @@ -2753,5 +2753,6 @@ static int nfs4_run_state_manager(void *ptr) goto again; nfs_put_client(clp); + module_put_and_kthread_exit(0); return 0; }
Commit f49169c97fce ("NFSD: Remove svc_serv_ops::svo_module") removed calls to module_put_and_kthread_exit() from threads that acted as SUNRPC servers and had a related svc_serv_ops structure. This was correct. It ALSO removed the module_put_and_kthread_exit() call from nfs4_run_state_manager() which is NOT a SUNRPC service. Consequently every time the NFSv4 state manager runs the module count increments and won't be decremented. So the nfsv4 module cannot be unloaded. So restore the module_put_and_kthread_exit() call. Fixes: f49169c97fce ("NFSD: Remove svc_serv_ops::svo_module") Signed-off-by: NeilBrown <neilb@suse.de> --- fs/nfs/nfs4state.c | 1 + 1 file changed, 1 insertion(+)