From: Andrew Morton <akpm@osdl.org>
Date: Fri, 29 Sep 2006 09:01:44 +0000 (-0700)
Subject: [PATCH] expand_fdtable(): remove pointless unlock+lock
X-Git-Tag: v2.6.19-rc1~659
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=327dcaadc0bc08ad081aa8e36b6ec7ad7aa45e30;p=linux-2.6

[PATCH] expand_fdtable(): remove pointless unlock+lock

This unlock/lock on a super-unlikely path isn't worth the kernel text.

Cc: Vadim Lobanov <vlobanov@speakeasy.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/fs/file.c b/fs/file.c
index 2a991ac8e5..8e81775c5d 100644
--- a/fs/file.c
+++ b/fs/file.c
@@ -317,9 +317,7 @@ static int expand_fdtable(struct files_struct *files, int nr)
 		free_fdtable(cur_fdt);
 	} else {
 		/* Somebody else expanded, so undo our attempt */
-		spin_unlock(&files->file_lock);
 		__free_fdtable(new_fdt);
-		spin_lock(&files->file_lock);
 	}
 	return 1;
 }