mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 02:30:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

don't bother with propagate_mnt() unless the target is shared

Browse source 
If the dest_mnt is not shared, propagate_mnt() does nothing -
there's no mounts to propagate to and thus no copies to create.
Might as well don't bother calling it in that case.

Cc: stable@vger.kernel.org
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2014-03-21 10:14:08 -04:00
parent 1d6a32acd7
commit 0b1b901b5a
1 changed files with 7 additions and 10 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

17
fs/namespace.c
View file

@ -1653,16 +1653,14 @@ static int attach_recursive_mnt(struct mount *source_mnt,
err = invent_group_ids(source_mnt, true); err = invent_group_ids(source_mnt, true);
if (err) if (err)
goto out; goto out;
} err = propagate_mnt(dest_mnt, dest_mp, source_mnt, &tree_list);
err = propagate_mnt(dest_mnt, dest_mp, source_mnt, &tree_list); if (err)
if (err) goto out_cleanup_ids;
goto out_cleanup_ids; lock_mount_hash();
lock_mount_hash();
if (IS_MNT_SHARED(dest_mnt)) {
for (p = source_mnt; p; p = next_mnt(p, source_mnt)) for (p = source_mnt; p; p = next_mnt(p, source_mnt))
set_mnt_shared(p); set_mnt_shared(p);
} else {
lock_mount_hash();
} }
if (parent_path) { if (parent_path) {
detach_mnt(source_mnt, parent_path); detach_mnt(source_mnt, parent_path);
@ -1685,8 +1683,7 @@ static int attach_recursive_mnt(struct mount *source_mnt,
return 0; return 0;
out_cleanup_ids: out_cleanup_ids:
if (IS_MNT_SHARED(dest_mnt)) cleanup_group_ids(source_mnt, NULL);
cleanup_group_ids(source_mnt, NULL);
out: out:
return err; return err;
} }