mirror of
https://github.com/rd-stuffs/msm-4.14.git
synced 2025-02-20 11:45:48 +08:00
ANDROID: mnt: remount should propagate to slaves of slaves
propagate_remount was not accounting for the slave mounts of other slave mounts, leading to some namespaces not recieving the remount information. bug:33731928 Change-Id: Idc9e8c2ed126a4143229fc23f10a959c2d0a3854 Signed-off-by: Daniel Rosenberg <drosen@google.com>
This commit is contained in:
parent
d6f17ede40
commit
a19b1fe4ed
27
fs/pnode.c
27
fs/pnode.c
@ -608,16 +608,31 @@ int propagate_umount(struct list_head *list)
|
||||
return 0;
|
||||
}
|
||||
|
||||
int propagate_remount(struct mount *mnt) {
|
||||
struct mount *m;
|
||||
/*
|
||||
* Iterates over all slaves, and slaves of slaves.
|
||||
*/
|
||||
static struct mount *next_descendent(struct mount *root, struct mount *cur)
|
||||
{
|
||||
if (!IS_MNT_NEW(cur) && !list_empty(&cur->mnt_slave_list))
|
||||
return first_slave(cur);
|
||||
do {
|
||||
if (cur->mnt_slave.next != &cur->mnt_master->mnt_slave_list)
|
||||
return next_slave(cur);
|
||||
cur = cur->mnt_master;
|
||||
} while (cur != root);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
void propagate_remount(struct mount *mnt)
|
||||
{
|
||||
struct mount *m = mnt;
|
||||
struct super_block *sb = mnt->mnt.mnt_sb;
|
||||
int ret = 0;
|
||||
|
||||
if (sb->s_op->copy_mnt_data) {
|
||||
for (m = first_slave(mnt); m->mnt_slave.next != &mnt->mnt_slave_list; m = next_slave(m)) {
|
||||
m = next_descendent(mnt, m);
|
||||
while (m) {
|
||||
sb->s_op->copy_mnt_data(m->mnt.data, mnt->mnt.data);
|
||||
m = next_descendent(mnt, m);
|
||||
}
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
@ -44,7 +44,7 @@ int propagate_mnt(struct mount *, struct mountpoint *, struct mount *,
|
||||
int propagate_umount(struct list_head *);
|
||||
int propagate_mount_busy(struct mount *, int);
|
||||
void propagate_mount_unlock(struct mount *);
|
||||
int propagate_remount(struct mount *);
|
||||
void propagate_remount(struct mount *);
|
||||
void mnt_release_group_id(struct mount *);
|
||||
int get_dominating_id(struct mount *mnt, const struct path *root);
|
||||
unsigned int mnt_get_count(struct mount *mnt);
|
||||
|
Loading…
x
Reference in New Issue
Block a user