| Message ID | 20240625-nfsd-testing-v1-1-89c4782c5a2e@kernel.org (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | nfsd: fix a regression in threads procfile interface | expand |
diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c index 9edb4f7c4cc2..23e73190687f 100644 --- a/fs/nfsd/nfssvc.c +++ b/fs/nfsd/nfssvc.c @@ -735,6 +735,13 @@ int nfsd_set_nrthreads(int n, int *nthreads, struct net *net) if (nn->nfsd_serv == NULL || n <= 0) return 0; + /* + * Special case: When n == 1, pass in NULL for the pool, so that the + * change is distributed equally among them. + */ + if (n == 1) + return svc_set_num_threads(nn->nfsd_serv, NULL, nthreads[0]); + if (n > nn->nfsd_serv->sv_nrpools) n = nn->nfsd_serv->sv_nrpools;
The old threads interface passed in NULL for the pool here which tells svc_set_num_threads to distribute the count over all the available pools. Fix the logic to handle this case correctly. Fixes: bbb07968d5e2 ("nfsd: make nfsd_svc take an array of thread counts") Signed-off-by: Jeff Layton <jlayton@kernel.org> --- It's probably best to squash this into bbb07968d5e2. --- fs/nfsd/nfssvc.c | 7 +++++++ 1 file changed, 7 insertions(+) --- base-commit: 26086b8c567f3f758cdf3e1fc2ae205095751cb8 change-id: 20240625-nfsd-testing-84df99227eba Best regards,