diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2011-03-01 18:20:20 -0500 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2011-03-01 18:20:20 -0500 |
| commit | 8d3c3ddfa85837e24fad6fa39318617cbb59e843 (patch) | |
| tree | f699dcaac2a11f0c9506ad111ae39fd5e3617c2d /fs/namespace.c | |
| parent | e8b2c3c47a53348aebbbeb5322e32937df958793 (diff) | |
| parent | 6927faf30920b8c03dfa007e732642a1f1f20089 (diff) | |
Merge branch 'drm-intel-fixes' into drm-intel-next
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); |