diff options
author | Valerie Aurora <vaurora@redhat.com> | 2010-01-26 14:20:47 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2010-03-03 14:07:55 -0500 |
commit | 495d6c9c6595ec7b37910dfd42634839431d21fd (patch) | |
tree | 375a2ea9803a91c5df34df80d7e08119d9772240 /fs/namespace.c | |
parent | 2ecdc82ef0b03e67ce5ecee79d0d108177a704df (diff) |
VFS: Clean up shared mount flag propagation
The handling of mount flags in set_mnt_shared() got a little tangled
up during previous cleanups, with the following problems:
* MNT_PNODE_MASK is defined as a literal constant when it should be a
bitwise xor of other MNT_* flags
* set_mnt_shared() clears and then sets MNT_SHARED (part of MNT_PNODE_MASK)
* MNT_PNODE_MASK could use a comment in mount.h
* MNT_PNODE_MASK is a terrible name, change to MNT_SHARED_MASK
This patch fixes these problems.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/namespace.c')
-rw-r--r-- | fs/namespace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/namespace.c b/fs/namespace.c index 25c1dcf9e9eb..d25d4602ab50 100644 --- a/fs/namespace.c +++ b/fs/namespace.c | |||
@@ -1538,7 +1538,7 @@ static int do_remount(struct path *path, int flags, int mnt_flags, | |||
1538 | err = do_remount_sb(sb, flags, data, 0); | 1538 | err = do_remount_sb(sb, flags, data, 0); |
1539 | if (!err) { | 1539 | if (!err) { |
1540 | spin_lock(&vfsmount_lock); | 1540 | spin_lock(&vfsmount_lock); |
1541 | mnt_flags |= path->mnt->mnt_flags & MNT_PNODE_MASK; | 1541 | mnt_flags |= path->mnt->mnt_flags & MNT_PROPAGATION_MASK; |
1542 | path->mnt->mnt_flags = mnt_flags; | 1542 | path->mnt->mnt_flags = mnt_flags; |
1543 | spin_unlock(&vfsmount_lock); | 1543 | spin_unlock(&vfsmount_lock); |
1544 | } | 1544 | } |