summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-02-24 19:39:46 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2011-02-24 19:39:46 +0300
commitdcace5ac85c628af21878a1fa151e5e6403fb8eb (patch)
treedcd9281b0bd7b10b9400a9f4769d6c887131b44a
parenta3e8cc643d22d2c8ed36b9be7d9c9ca21efcf7f7 (diff)
parentbf9faa2aa30e2ebf30287536712ed2717bb47002 (diff)
downloadlinux-dcace5ac85c628af21878a1fa151e5e6403fb8eb.tar.xz
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: Unlock vfsmount_lock in do_umount
-rw-r--r--fs/namespace.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/namespace.c b/fs/namespace.c
index 7b0b95371696..d1edf26025dc 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -1244,7 +1244,7 @@ static int do_umount(struct vfsmount *mnt, int flags)
*/
br_write_lock(vfsmount_lock);
if (mnt_get_count(mnt) != 2) {
- br_write_lock(vfsmount_lock);
+ br_write_unlock(vfsmount_lock);
return -EBUSY;
}
br_write_unlock(vfsmount_lock);