diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 05:27:25 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 05:27:25 +0000 |
| commit | c9c06167e7933d93a6e396174c68abf242294abb (patch) | |
| tree | d9a8bb30663e9a3405a1ef37ffb62bc14b9f019f /fs/super.c | |
| parent | f79e8cc3c34e4192a3e5ef4cc9c6542fdef703c0 (diff) | |
Merge with Linux 2.4.0-test12.
Diffstat (limited to 'fs/super.c')
| -rw-r--r-- | fs/super.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/super.c b/fs/super.c index 4f2e3908a..1c0b48c11 100644 --- a/fs/super.c +++ b/fs/super.c @@ -1037,13 +1037,13 @@ static int do_umount(struct vfsmount *mnt, int umount_root, int flags) } spin_lock(&dcache_lock); - if (atomic_read(&mnt->mnt_count) > 2) { - spin_unlock(&dcache_lock); - mntput(mnt); - return -EBUSY; - } if (mnt->mnt_instances.next != mnt->mnt_instances.prev) { + if (atomic_read(&mnt->mnt_count) > 2) { + spin_unlock(&dcache_lock); + mntput(mnt); + return -EBUSY; + } if (sb->s_type->fs_flags & FS_SINGLE) put_filesystem(sb->s_type); /* We hold two references, so mntput() is safe */ |