Browse Source

drivers/misc/sgi-gru/grukdump.c: unlocking should be conditional in gru_dump_context()

I was reviewing this and noticed that unlocking should be conditional on
the error path.  I've changed it to unlock and return directly since we
only do it once and it seems unlikely to change in the near future.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Dimitri Sivanich <sivanich@sgi.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Dan Carpenter 11 years ago
parent
commit
49d3d6c37a
1 changed files with 5 additions and 6 deletions
  1. 5 6
      drivers/misc/sgi-gru/grukdump.c

+ 5 - 6
drivers/misc/sgi-gru/grukdump.c

@@ -139,8 +139,11 @@ static int gru_dump_context(struct gru_state *gru, int ctxnum,
 
 
 	ubuf += sizeof(hdr);
 	ubuf += sizeof(hdr);
 	ubufcch = ubuf;
 	ubufcch = ubuf;
-	if (gru_user_copy_handle(&ubuf, cch))
-		goto fail;
+	if (gru_user_copy_handle(&ubuf, cch)) {
+		if (cch_locked)
+			unlock_cch_handle(cch);
+		return -EFAULT;
+	}
 	if (cch_locked)
 	if (cch_locked)
 		ubufcch->delresp = 0;
 		ubufcch->delresp = 0;
 	bytes = sizeof(hdr) + GRU_CACHE_LINE_BYTES;
 	bytes = sizeof(hdr) + GRU_CACHE_LINE_BYTES;
@@ -179,10 +182,6 @@ static int gru_dump_context(struct gru_state *gru, int ctxnum,
 		ret = -EFAULT;
 		ret = -EFAULT;
 
 
 	return ret ? ret : bytes;
 	return ret ? ret : bytes;
-
-fail:
-	unlock_cch_handle(cch);
-	return -EFAULT;
 }
 }
 
 
 int gru_dump_chiplet_request(unsigned long arg)
 int gru_dump_chiplet_request(unsigned long arg)