diff options
Diffstat (limited to 'fs/pnode.c')
-rw-r--r-- | fs/pnode.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/pnode.c b/fs/pnode.c index 12cc1518e0cd..cec329822a16 100644 --- a/fs/pnode.c +++ b/fs/pnode.c | |||
@@ -36,7 +36,7 @@ static struct mount *get_peer_under_root(struct mount *mnt, | |||
36 | 36 | ||
37 | do { | 37 | do { |
38 | /* Check the namespace first for optimization */ | 38 | /* Check the namespace first for optimization */ |
39 | if (m->mnt.mnt_ns == ns && is_path_reachable(m, m->mnt.mnt_root, root)) | 39 | if (m->mnt_ns == ns && is_path_reachable(m, m->mnt.mnt_root, root)) |
40 | return m; | 40 | return m; |
41 | 41 | ||
42 | m = next_peer(m); | 42 | m = next_peer(m); |
@@ -56,7 +56,7 @@ int get_dominating_id(struct mount *mnt, const struct path *root) | |||
56 | struct mount *m; | 56 | struct mount *m; |
57 | 57 | ||
58 | for (m = mnt->mnt_master; m != NULL; m = m->mnt_master) { | 58 | for (m = mnt->mnt_master; m != NULL; m = m->mnt_master) { |
59 | struct mount *d = get_peer_under_root(m, mnt->mnt.mnt_ns, root); | 59 | struct mount *d = get_peer_under_root(m, mnt->mnt_ns, root); |
60 | if (d) | 60 | if (d) |
61 | return d->mnt.mnt_group_id; | 61 | return d->mnt.mnt_group_id; |
62 | } | 62 | } |
@@ -145,7 +145,7 @@ static struct mount *propagation_next(struct mount *m, | |||
145 | struct mount *origin) | 145 | struct mount *origin) |
146 | { | 146 | { |
147 | /* are there any slaves of this mount? */ | 147 | /* are there any slaves of this mount? */ |
148 | if (!IS_MNT_NEW(&m->mnt) && !list_empty(&m->mnt_slave_list)) | 148 | if (!IS_MNT_NEW(m) && !list_empty(&m->mnt_slave_list)) |
149 | return first_slave(m); | 149 | return first_slave(m); |
150 | 150 | ||
151 | while (1) { | 151 | while (1) { |
@@ -189,7 +189,7 @@ static struct mount *get_source(struct mount *dest, | |||
189 | if (p_last_dest) { | 189 | if (p_last_dest) { |
190 | do { | 190 | do { |
191 | p_last_dest = next_peer(p_last_dest); | 191 | p_last_dest = next_peer(p_last_dest); |
192 | } while (IS_MNT_NEW(&p_last_dest->mnt)); | 192 | } while (IS_MNT_NEW(p_last_dest)); |
193 | /* is that a peer of the earlier? */ | 193 | /* is that a peer of the earlier? */ |
194 | if (dest == p_last_dest) { | 194 | if (dest == p_last_dest) { |
195 | *type = CL_MAKE_SHARED; | 195 | *type = CL_MAKE_SHARED; |
@@ -232,7 +232,7 @@ int propagate_mnt(struct mount *dest_mnt, struct dentry *dest_dentry, | |||
232 | int type; | 232 | int type; |
233 | struct mount *source; | 233 | struct mount *source; |
234 | 234 | ||
235 | if (IS_MNT_NEW(&m->mnt)) | 235 | if (IS_MNT_NEW(m)) |
236 | continue; | 236 | continue; |
237 | 237 | ||
238 | source = get_source(m, prev_dest_mnt, prev_src_mnt, &type); | 238 | source = get_source(m, prev_dest_mnt, prev_src_mnt, &type); |