diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-24 11:39:46 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-24 11:39:46 -0500 |
| commit | dcace5ac85c628af21878a1fa151e5e6403fb8eb (patch) | |
| tree | dcd9281b0bd7b10b9400a9f4769d6c887131b44a /fs/namespace.c | |
| parent | a3e8cc643d22d2c8ed36b9be7d9c9ca21efcf7f7 (diff) | |
| parent | bf9faa2aa30e2ebf30287536712ed2717bb47002 (diff) | |
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
Diffstat (limited to 'fs/namespace.c')
| -rw-r--r-- | fs/namespace.c | 2 |
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) | |||
| 1244 | */ | 1244 | */ |
| 1245 | br_write_lock(vfsmount_lock); | 1245 | br_write_lock(vfsmount_lock); |
| 1246 | if (mnt_get_count(mnt) != 2) { | 1246 | if (mnt_get_count(mnt) != 2) { |
| 1247 | br_write_lock(vfsmount_lock); | 1247 | br_write_unlock(vfsmount_lock); |
| 1248 | return -EBUSY; | 1248 | return -EBUSY; |
| 1249 | } | 1249 | } |
| 1250 | br_write_unlock(vfsmount_lock); | 1250 | br_write_unlock(vfsmount_lock); |