[PATCH] expand_fdtable(): remove pointless unlock+lock
authorAndrew Morton <akpm@osdl.org>
Fri, 29 Sep 2006 09:01:44 +0000 (02:01 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 29 Sep 2006 16:18:25 +0000 (09:18 -0700)
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>
fs/file.c

index 2a991ac8e562599cbe43d4dfd8f2452c6d92bf3b..8e81775c5dc818bd3b9d66e3fd895524294f5c78 100644 (file)
--- 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;
 }