summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--fs/pnode.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/fs/pnode.c b/fs/pnode.c
index 14618eac2025..9723f05cda5f 100644
--- a/fs/pnode.c
+++ b/fs/pnode.c
@@ -70,10 +70,8 @@ static int do_make_slave(struct mount *mnt)
struct mount *master, *slave_mnt;
if (list_empty(&mnt->mnt_share)) {
- if (IS_MNT_SHARED(mnt)) {
- mnt_release_group_id(mnt);
- CLEAR_MNT_SHARED(mnt);
- }
+ mnt_release_group_id(mnt);
+ CLEAR_MNT_SHARED(mnt);
master = mnt->mnt_master;
if (!master) {
struct list_head *p = &mnt->mnt_slave_list;
@@ -119,7 +117,8 @@ void change_mnt_propagation(struct mount *mnt, int type)
set_mnt_shared(mnt);
return;
}
- do_make_slave(mnt);
+ if (IS_MNT_SHARED(mnt))
+ do_make_slave(mnt);
list_del_init(&mnt->mnt_slave);
if (type == MS_SLAVE) {
if (mnt->mnt_master)