diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2011-11-25 06:22:05 +0100 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-01-04 04:57:08 +0100 |
| commit | 6776db3d32b2a59198ec7ac6d32be0b9fdbd8a68 (patch) | |
| tree | d293d993f41bdea79eaeb51f404e9837a49cb039 /fs/pnode.c | |
| parent | vfs: and now we can make ->mnt_master point to struct mount (diff) | |
| download | linux-6776db3d32b2a59198ec7ac6d32be0b9fdbd8a68.tar.xz linux-6776db3d32b2a59198ec7ac6d32be0b9fdbd8a68.zip | |
vfs: take mnt_share/mnt_slave/mnt_slave_list and mnt_expire to struct mount
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/pnode.c')
| -rw-r--r-- | fs/pnode.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/fs/pnode.c b/fs/pnode.c index 9bf22b61f8fb..12cc1518e0cd 100644 --- a/fs/pnode.c +++ b/fs/pnode.c @@ -15,17 +15,17 @@ /* return the next shared peer mount of @p */ static inline struct mount *next_peer(struct mount *p) { - return list_entry(p->mnt.mnt_share.next, struct mount, mnt.mnt_share); + return list_entry(p->mnt_share.next, struct mount, mnt_share); } static inline struct mount *first_slave(struct mount *p) { - return list_entry(p->mnt.mnt_slave_list.next, struct mount, mnt.mnt_slave); + return list_entry(p->mnt_slave_list.next, struct mount, mnt_slave); } static inline struct mount *next_slave(struct mount *p) { - return list_entry(p->mnt.mnt_slave.next, struct mount, mnt.mnt_slave); + return list_entry(p->mnt_slave.next, struct mount, mnt_slave); } static struct mount *get_peer_under_root(struct mount *mnt, @@ -82,27 +82,27 @@ static int do_make_slave(struct mount *mnt) if (peer_mnt == mnt) peer_mnt = NULL; } - if (IS_MNT_SHARED(&mnt->mnt) && list_empty(&mnt->mnt.mnt_share)) + if (IS_MNT_SHARED(&mnt->mnt) && list_empty(&mnt->mnt_share)) mnt_release_group_id(mnt); - list_del_init(&mnt->mnt.mnt_share); + list_del_init(&mnt->mnt_share); mnt->mnt.mnt_group_id = 0; if (peer_mnt) master = peer_mnt; if (master) { - list_for_each_entry(slave_mnt, &mnt->mnt.mnt_slave_list, mnt.mnt_slave) + list_for_each_entry(slave_mnt, &mnt->mnt_slave_list, mnt_slave) slave_mnt->mnt_master = master; - list_move(&mnt->mnt.mnt_slave, &master->mnt.mnt_slave_list); - list_splice(&mnt->mnt.mnt_slave_list, master->mnt.mnt_slave_list.prev); - INIT_LIST_HEAD(&mnt->mnt.mnt_slave_list); + list_move(&mnt->mnt_slave, &master->mnt_slave_list); + list_splice(&mnt->mnt_slave_list, master->mnt_slave_list.prev); + INIT_LIST_HEAD(&mnt->mnt_slave_list); } else { - struct list_head *p = &mnt->mnt.mnt_slave_list; + struct list_head *p = &mnt->mnt_slave_list; while (!list_empty(p)) { slave_mnt = list_first_entry(p, - struct mount, mnt.mnt_slave); - list_del_init(&slave_mnt->mnt.mnt_slave); + struct mount, mnt_slave); + list_del_init(&slave_mnt->mnt_slave); slave_mnt->mnt_master = NULL; } } @@ -122,7 +122,7 @@ void change_mnt_propagation(struct mount *mnt, int type) } do_make_slave(mnt); if (type != MS_SLAVE) { - list_del_init(&mnt->mnt.mnt_slave); + list_del_init(&mnt->mnt_slave); mnt->mnt_master = NULL; if (type == MS_UNBINDABLE) mnt->mnt.mnt_flags |= MNT_UNBINDABLE; @@ -145,7 +145,7 @@ static struct mount *propagation_next(struct mount *m, struct mount *origin) { /* are there any slaves of this mount? */ - if (!IS_MNT_NEW(&m->mnt) && !list_empty(&m->mnt.mnt_slave_list)) + if (!IS_MNT_NEW(&m->mnt) && !list_empty(&m->mnt_slave_list)) return first_slave(m); while (1) { @@ -154,7 +154,7 @@ static struct mount *propagation_next(struct mount *m, if (master == origin->mnt_master) { struct mount *next = next_peer(m); return (next == origin) ? NULL : next; - } else if (m->mnt.mnt_slave.next != &master->mnt.mnt_slave_list) + } else if (m->mnt_slave.next != &master->mnt_slave_list) return next_slave(m); /* back at master */ |