Преглед на файлове

[PATCH] nfsd4: fix setclientid unlock of unlocked state lock

We could try to unlock the state lock here without having first locked it.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Neil Brown преди 20 години
родител
ревизия
73aea4ecd3
променени са 1 файла, в които са добавени 2 реда и са изтрити 3 реда
  1. 2 3
      fs/nfsd/nfs4state.c

+ 2 - 3
fs/nfsd/nfs4state.c

@@ -678,13 +678,12 @@ nfsd4_setclientid(struct svc_rqst *rqstp, struct nfsd4_setclientid *setclid)
 	int 			status;
 	int 			status;
 	char                    dname[HEXDIR_LEN];
 	char                    dname[HEXDIR_LEN];
 	
 	
-	status = nfserr_inval;
 	if (!check_name(clname))
 	if (!check_name(clname))
-		goto out;
+		return nfserr_inval;
 
 
 	status = nfs4_make_rec_clidname(dname, &clname);
 	status = nfs4_make_rec_clidname(dname, &clname);
 	if (status)
 	if (status)
-		goto out;
+		return status;
 
 
 	/* 
 	/* 
 	 * XXX The Duplicate Request Cache (DRC) has been checked (??)
 	 * XXX The Duplicate Request Cache (DRC) has been checked (??)