From c9c06167e7933d93a6e396174c68abf242294abb Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Wed, 10 Jan 2001 05:27:25 +0000 Subject: Merge with Linux 2.4.0-test12. --- fs/super.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'fs/super.c') 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 */ -- cgit v1.2.3