diff options
| author | David S. Miller <davem@davemloft.net> | 2011-03-04 00:27:42 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-04 00:27:42 -0500 |
| commit | 0a0e9ae1bd788bc19adc4d4ae08c98b233697402 (patch) | |
| tree | 13825eeb5bbeae27d66e95f12168eff4b60701ab /fs/namespace.c | |
| parent | 01a16b21d6adf992aa863186c3c4e561a57c1714 (diff) | |
| parent | b65a0e0c84cf489bfa00d6aa6c48abc5a237100f (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/bnx2x/bnx2x.h
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); |