---

yaml --- r: 206437 b: refs/heads/master c: 78a8d7c h: refs/heads/master i: 206435: 67669a0 v: v3
git-mirror · Jul 23, 2010 · 08ee920 · 08ee920
1 parent 4f2a118
commit 08ee920
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4ad9a344be2291b1e594a4a5aee25c5a5df34a97
+refs/heads/master: 78a8d7c8ca3f0cb5cd2a276c6fc17c8c006d0b3c
diff --git a/trunk/fs/nfsd/nfsctl.c b/trunk/fs/nfsd/nfsctl.c
@@ -950,14 +950,18 @@ static ssize_t __write_ports_addfd(char *buf)
 		return err;
 
 	err = lockd_up();
-	if (err != 0)
-		goto out;
+	if (err != 0) {
+		svc_destroy(nfsd_serv);
+		return err;
+	}
 
 	err = svc_addsock(nfsd_serv, fd, buf, SIMPLE_TRANSACTION_LIMIT);
-	if (err < 0)
+	if (err < 0) {
 		lockd_down();
+		svc_destroy(nfsd_serv);
+		return err;
+	}
 
-out:
 	/* Decrease the count, but don't shut down the service */
 	nfsd_serv->sv_nrthreads--;
 	return err;