Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6339dab8 authored by Al Viro's avatar Al Viro
Browse files

do_remount(): pull touch_mnt_namespace() up 



... and don't bother with dropping and regaining vfsmount_lock

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent aa7a574d

fs/namespace.c

+1 −5
Original line number Diff line number Diff line
@@ -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;

}