The patch titled knfsd: add svc_get has been added to the -mm tree. Its filename is knfsd-add-svc_get.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: knfsd: add svc_get From: Greg Banks <gnb@xxxxxxxxxxxxxxxxx> add svc_get() for those occasions when we need to temporarily bump up svc_serv->sv_nrthreads as a pseudo refcount. Signed-off-by: Greg Banks <gnb@xxxxxxxxxxxxxxxxx> Signed-off-by: Neil Brown <neilb@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- fs/nfsd/nfssvc.c | 2 +- include/linux/sunrpc/svc.h | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff -puN fs/nfsd/nfssvc.c~knfsd-add-svc_get fs/nfsd/nfssvc.c --- a/fs/nfsd/nfssvc.c~knfsd-add-svc_get +++ a/fs/nfsd/nfssvc.c @@ -200,7 +200,7 @@ int nfsd_create_serv(void) int err = 0; lock_kernel(); if (nfsd_serv) { - nfsd_serv->sv_nrthreads++; + svc_get(nfsd_serv); unlock_kernel(); return 0; } diff -puN include/linux/sunrpc/svc.h~knfsd-add-svc_get include/linux/sunrpc/svc.h --- a/include/linux/sunrpc/svc.h~knfsd-add-svc_get +++ a/include/linux/sunrpc/svc.h @@ -71,6 +71,17 @@ struct svc_serv { }; /* + * We use sv_nrthreads as a reference count. svc_destroy() drops + * this refcount, so we need to bump it up around operations that + * change the number of threads. Horrible, but there it is. + * Should be called with the BKL held. + */ +static inline void svc_get(struct svc_serv *serv) +{ + serv->sv_nrthreads++; +} + +/* * Maximum payload size supported by a kernel RPC server. * This is use to determine the max number of pages nfsd is * willing to return in a single READ operation. _ Patches currently in -mm which might be from gnb@xxxxxxxxxxxxxxxxx are knfsd-knfsd-add-some-missing-newlines-in-printks.patch knfsd-knfsd-remove-an-unused-variable-from-e_show.patch knfsd-knfsd-remove-an-unused-variable-from-auth_unix_lookup.patch knfsd-use-seq_start_token-instead-of-hardcoded-magic-void1.patch knfsd-move-tempsock-aging-to-a-timer.patch knfsd-move-tempsock-aging-to-a-timer-tidy.patch knfsd-convert-sk_inuse-to-atomic_t.patch knfsd-use-new-lock-for-svc_sock-deferred-list.patch knfsd-convert-sk_reserved-to-atomic_t.patch knfsd-test-and-set-sk_busy-atomically.patch knfsd-split-svc_serv-into-pools.patch knfsd-add-svc_get.patch knfsd-add-svc_set_num_threads.patch knfsd-use-svc_set_num_threads-to-manage-threads-in-knfsd.patch knfsd-make-rpc-threads-pools-numa-aware.patch knfsd-allow-admin-to-set-nthreads-per-node.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html