2013-10-03 06:18:09

by Al Viro

[permalink] [raw]
Subject: [PATCH 04/17] do_remount(): pull touch_mnt_namespace() up


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

Signed-off-by: Al Viro <[email protected]>
---
fs/namespace.c | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/fs/namespace.c b/fs/namespace.c
index 09a255d..41663dd 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;
}

--
1.7.2.5