From 6339dab869e07a81abd22970696dde6febee094a Mon Sep 17 00:00:00 2001 From: Al Viro Date: Mon, 16 Sep 2013 22:41:01 -0400 Subject: do_remount(): pull touch_mnt_namespace() up ... and don't bother with dropping and regaining vfsmount_lock Signed-off-by: Al Viro --- fs/namespace.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'fs/namespace.c') diff --git a/fs/namespace.c b/fs/namespace.c index 17ff147..3ee6e59 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -1849,14 +1849,10 @@ static int do_remount(struct path *path, int flags, int mnt_flags, br_write_lock(&vfsmount_lock); mnt_flags |= mnt->mnt.mnt_flags & MNT_PROPAGATION_MASK; mnt->mnt.mnt_flags = mnt_flags; - br_write_unlock(&vfsmount_lock); - } - up_write(&sb->s_umount); - if (!err) { - br_write_lock(&vfsmount_lock); touch_mnt_namespace(mnt->mnt_ns); br_write_unlock(&vfsmount_lock); } + up_write(&sb->s_umount); return err; } -- cgit v1.1