From: Jeff Layton <jlayton@redhat.com>
Date: Wed, 21 Jul 2010 20:40:08 +0000 (-0400)
Subject: nfsd: clean up nfsd_create_serv error handling
X-Git-Tag: v3.12-rc1~8792^2~22
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=628b368728e23188ac41b3f00411b02be8e697f1;p=kernel%2Fkernel-generic.git

nfsd: clean up nfsd_create_serv error handling

There doesn't seem to be any need to reset the nfssvc_boot time if the
nfsd startup failed.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
---

diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c
index d7a4d7b..a631ea6 100644
--- a/fs/nfsd/nfssvc.c
+++ b/fs/nfsd/nfssvc.c
@@ -292,10 +292,9 @@ int nfsd_create_serv(void)
 	nfsd_serv = svc_create_pooled(&nfsd_program, nfsd_max_blksize,
 				      nfsd_last_thread, nfsd, THIS_MODULE);
 	if (nfsd_serv == NULL)
-		err = -ENOMEM;
-	else
-		set_max_drc();
+		return -ENOMEM;
 
+	set_max_drc();
 	do_gettimeofday(&nfssvc_boot);		/* record boot time */
 	return err;
 }