summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2006-09-29 02:01:44 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-29 09:18:25 -0700
commit327dcaadc0bc08ad081aa8e36b6ec7ad7aa45e30 (patch)
tree68bec9183fcee79370e076244be347dd20d5dd9f
parent74d392aaabfc890cc1f0e80fc5ff13e5d3bcf4c9 (diff)
downloadlinux-327dcaadc0bc08ad081aa8e36b6ec7ad7aa45e30.tar.gz
[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>
-rw-r--r--fs/file.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/file.c b/fs/file.c
index 2a991ac8e562..8e81775c5dc8 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;
 }