On Wed, 9 Jun 2010 14:09:07 -0400 "J. Bruce Fields" <bfields@xxxxxxxxxxxx> wrote: > On Wed, Jun 09, 2010 at 06:29:22AM -0400, Jeff Layton wrote: > > On Tue, 8 Jun 2010 19:58:28 -0400 > > "J. Bruce Fields" <bfields@xxxxxxxxxxxx> wrote: > > > > > On Mon, Jun 07, 2010 at 11:33:18AM -0400, Jeff Layton wrote: > > > > If someone tries to shut down the laundry_wq while it isn't up it'll > > > > cause an oops. > > > > > > OK, thanks. > > > > > > Hm: what about the opposite (admittedly probably less crucial) problem: > > > are there cases where nfs4_state_start() gets called but never > > > nfs4_state_shutdown? > > > > > > From a quick look, I don't see what prevents that. > > > > > > --b. > > > > > > > I don't see that problem. nfs4_state_shutdown gets called when the > > nfsd_serv is torn down, and it only gets brought up in nfsd_svc, > > If nfs4_state_start() succeeds, then nfsd_create_server() is called. It calls > svc_create_pooled(), which is passed nfsd_last_thread() as a parameter. > > If svc_create_pooled succeeds, then I think we're guaranteed nfsd_last_thread() > will get called eventually. > > But if svc_create_pooled fails, I don't think nfsd_last_thread() is ever > called. > Ahh ok, I see what you're talking about now. Yeah, that should probably also be fixed. I think we just need to ensure to shut down the state in an error condition. Something like this compile-tested only patch? >From 19bd25ea9a76ea184e4c30831765e812ce19b0a5 Mon Sep 17 00:00:00 2001 From: Jeff Layton <jlayton@xxxxxxxxxx> Date: Wed, 9 Jun 2010 14:21:51 -0400 Subject: [PATCH] nfsd: shut down NFSv4 state when nfsd_svc encounters an error Currently, it's left up in some situations. That could cause the grace period to be shorter than it should be (along with other problems). Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx> --- fs/nfsd/nfssvc.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c index 06b2a26..a06ea99 100644 --- a/fs/nfsd/nfssvc.c +++ b/fs/nfsd/nfssvc.c @@ -402,9 +402,9 @@ nfsd_svc(unsigned short port, int nrservs) nfsd_reset_versions(); error = nfsd_create_serv(); - if (error) - goto out; + goto shutdown_state; + error = nfsd_init_socks(port); if (error) goto failure; @@ -416,9 +416,12 @@ nfsd_svc(unsigned short port, int nrservs) * so subtract 1 */ error = nfsd_serv->sv_nrthreads - 1; - failure: +failure: svc_destroy(nfsd_serv); /* Release server */ - out: +shutdown_state: + if (error < 0) + nfs4_state_shutdown(); +out: mutex_unlock(&nfsd_mutex); return error; } -- 1.5.5.6 -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
