diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2014-10-07 19:22:52 -0400 |
---|---|---|
committer | Eric W. Biederman <ebiederm@xmission.com> | 2014-12-02 11:46:50 -0500 |
commit | 8486a7882b5ba906992fd78bbfcefaae7fe285cc (patch) | |
tree | 5b6f8175e8cce90109c60032370281c37c580a34 /fs/pnode.c | |
parent | da362b09e42ee0bcaf0356afee6078b4f324baff (diff) |
mnt: Move the clear of MNT_LOCKED from copy_tree to it's callers.
Clear MNT_LOCKED in the callers of copy_tree except copy_mnt_ns, and
collect_mounts. In copy_mnt_ns it is necessary to create an exact
copy of a mount tree, so not clearing MNT_LOCKED is important.
Similarly collect_mounts is used to take a snapshot of the mount tree
for audit logging purposes and auditing using a faithful copy of the
tree is important.
This becomes particularly significant when we start setting MNT_LOCKED
on rootfs to prevent it from being unmounted.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Diffstat (limited to 'fs/pnode.c')
-rw-r--r-- | fs/pnode.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/pnode.c b/fs/pnode.c index aae331a5d03b..260ac8f898a4 100644 --- a/fs/pnode.c +++ b/fs/pnode.c | |||
@@ -242,6 +242,7 @@ static int propagate_one(struct mount *m) | |||
242 | child = copy_tree(last_source, last_source->mnt.mnt_root, type); | 242 | child = copy_tree(last_source, last_source->mnt.mnt_root, type); |
243 | if (IS_ERR(child)) | 243 | if (IS_ERR(child)) |
244 | return PTR_ERR(child); | 244 | return PTR_ERR(child); |
245 | child->mnt.mnt_flags &= ~MNT_LOCKED; | ||
245 | mnt_set_mountpoint(m, mp, child); | 246 | mnt_set_mountpoint(m, mp, child); |
246 | last_dest = m; | 247 | last_dest = m; |
247 | last_source = child; | 248 | last_source = child; |