Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 280184
b: refs/heads/master
c: 3376f34
h: refs/heads/master
v: v3
  • Loading branch information
Al Viro committed Jan 4, 2012
1 parent ade76dc commit 4356bc6
Show file tree
Hide file tree
Showing 7 changed files with 31 additions and 30 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 643822b41e5e0f133438883b0be574cdaf168a2a
refs/heads/master: 3376f34fff5be9954fd9a9c4fd68f4a0a36d480e
2 changes: 1 addition & 1 deletion trunk/fs/dcache.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2465,7 +2465,7 @@ static int prepend_path(const struct path *path,
if (!mnt_has_parent(mnt))
goto global_root;
dentry = vfsmnt->mnt_mountpoint;
vfsmnt = vfsmnt->mnt_parent;
vfsmnt = mnt->mnt_parent;
continue;
}
parent = dentry->d_parent;
Expand Down
3 changes: 2 additions & 1 deletion trunk/fs/mount.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

struct mount {
struct list_head mnt_hash;
struct vfsmount *mnt_parent;
struct vfsmount mnt;
};

Expand All @@ -12,7 +13,7 @@ static inline struct mount *real_mount(struct vfsmount *mnt)

static inline int mnt_has_parent(struct mount *mnt)
{
return &mnt->mnt != mnt->mnt.mnt_parent;
return &mnt->mnt != mnt->mnt_parent;
}

extern struct mount *__lookup_mnt(struct vfsmount *, struct dentry *, int);
4 changes: 2 additions & 2 deletions trunk/fs/namei.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -680,7 +680,7 @@ static int follow_up_rcu(struct path *path)
struct vfsmount *parent;
struct dentry *mountpoint;

parent = path->mnt->mnt_parent;
parent = real_mount(path->mnt)->mnt_parent;
if (parent == path->mnt)
return 0;
mountpoint = path->mnt->mnt_mountpoint;
Expand All @@ -695,7 +695,7 @@ int follow_up(struct path *path)
struct dentry *mountpoint;

br_read_lock(vfsmount_lock);
parent = path->mnt->mnt_parent;
parent = real_mount(path->mnt)->mnt_parent;
if (parent == path->mnt) {
br_read_unlock(vfsmount_lock);
return 0;
Expand Down
45 changes: 23 additions & 22 deletions trunk/fs/namespace.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -476,7 +476,7 @@ struct mount *__lookup_mnt(struct vfsmount *mnt, struct dentry *dentry,
if (tmp == head)
break;
p = list_entry(tmp, struct mount, mnt_hash);
if (p->mnt.mnt_parent == mnt && p->mnt.mnt_mountpoint == dentry) {
if (p->mnt_parent == mnt && p->mnt.mnt_mountpoint == dentry) {
found = p;
break;
}
Expand Down Expand Up @@ -558,8 +558,8 @@ static void dentry_reset_mounted(struct dentry *dentry)
static void detach_mnt(struct mount *mnt, struct path *old_path)
{
old_path->dentry = mnt->mnt.mnt_mountpoint;
old_path->mnt = mnt->mnt.mnt_parent;
mnt->mnt.mnt_parent = &mnt->mnt;
old_path->mnt = mnt->mnt_parent;
mnt->mnt_parent = &mnt->mnt;
mnt->mnt.mnt_mountpoint = mnt->mnt.mnt_root;
list_del_init(&mnt->mnt.mnt_child);
list_del_init(&mnt->mnt_hash);
Expand All @@ -572,7 +572,7 @@ static void detach_mnt(struct mount *mnt, struct path *old_path)
void mnt_set_mountpoint(struct vfsmount *mnt, struct dentry *dentry,
struct mount *child_mnt)
{
child_mnt->mnt.mnt_parent = mntget(mnt);
child_mnt->mnt_parent = mntget(mnt);
child_mnt->mnt.mnt_mountpoint = dget(dentry);
spin_lock(&dentry->d_lock);
dentry->d_flags |= DCACHE_MOUNTED;
Expand Down Expand Up @@ -610,7 +610,7 @@ static inline void __mnt_make_shortterm(struct vfsmount *mnt)
*/
static void commit_tree(struct mount *mnt)
{
struct vfsmount *parent = mnt->mnt.mnt_parent;
struct vfsmount *parent = mnt->mnt_parent;
struct vfsmount *m;
LIST_HEAD(head);
struct mnt_namespace *n = parent->mnt_ns;
Expand Down Expand Up @@ -639,9 +639,9 @@ static struct mount *next_mnt(struct mount *p, struct vfsmount *root)
if (&p->mnt == root)
return NULL;
next = p->mnt.mnt_child.next;
if (next != &p->mnt.mnt_parent->mnt_mounts)
if (next != &p->mnt_parent->mnt_mounts)
break;
p = real_mount(p->mnt.mnt_parent);
p = real_mount(p->mnt_parent);
}
}
return list_entry(next, struct mount, mnt.mnt_child);
Expand Down Expand Up @@ -682,7 +682,7 @@ vfs_kern_mount(struct file_system_type *type, int flags, const char *name, void
mnt->mnt.mnt_root = root;
mnt->mnt.mnt_sb = root->d_sb;
mnt->mnt.mnt_mountpoint = mnt->mnt.mnt_root;
mnt->mnt.mnt_parent = &mnt->mnt;
mnt->mnt_parent = &mnt->mnt;
return &mnt->mnt;
}
EXPORT_SYMBOL_GPL(vfs_kern_mount);
Expand Down Expand Up @@ -710,7 +710,7 @@ static struct mount *clone_mnt(struct mount *old, struct dentry *root,
mnt->mnt.mnt_sb = sb;
mnt->mnt.mnt_root = dget(root);
mnt->mnt.mnt_mountpoint = mnt->mnt.mnt_root;
mnt->mnt.mnt_parent = &mnt->mnt;
mnt->mnt_parent = &mnt->mnt;

if (flag & CL_SLAVE) {
list_add(&mnt->mnt.mnt_slave, &old->mnt.mnt_slave_list);
Expand Down Expand Up @@ -1021,12 +1021,13 @@ static int show_mountinfo(struct seq_file *m, void *v)
{
struct proc_mounts *p = m->private;
struct vfsmount *mnt = list_entry(v, struct vfsmount, mnt_list);
struct mount *r = real_mount(mnt);
struct super_block *sb = mnt->mnt_sb;
struct path mnt_path = { .dentry = mnt->mnt_root, .mnt = mnt };
struct path root = p->root;
int err = 0;

seq_printf(m, "%i %i %u:%u ", mnt->mnt_id, mnt->mnt_parent->mnt_id,
seq_printf(m, "%i %i %u:%u ", mnt->mnt_id, r->mnt_parent->mnt_id,
MAJOR(sb->s_dev), MINOR(sb->s_dev));
if (sb->s_op->show_path)
err = sb->s_op->show_path(m, mnt);
Expand Down Expand Up @@ -1201,9 +1202,9 @@ void release_mounts(struct list_head *head)

br_write_lock(vfsmount_lock);
dentry = mnt->mnt.mnt_mountpoint;
m = mnt->mnt.mnt_parent;
m = mnt->mnt_parent;
mnt->mnt.mnt_mountpoint = mnt->mnt.mnt_root;
mnt->mnt.mnt_parent = &mnt->mnt;
mnt->mnt_parent = &mnt->mnt;
m->mnt_ghosts--;
br_write_unlock(vfsmount_lock);
dput(dentry);
Expand Down Expand Up @@ -1236,7 +1237,7 @@ void umount_tree(struct mount *mnt, int propagate, struct list_head *kill)
__mnt_make_shortterm(&p->mnt);
list_del_init(&p->mnt.mnt_child);
if (mnt_has_parent(p)) {
p->mnt.mnt_parent->mnt_ghosts++;
p->mnt_parent->mnt_ghosts++;
dentry_reset_mounted(p->mnt.mnt_mountpoint);
}
change_mnt_propagation(p, MS_PRIVATE);
Expand Down Expand Up @@ -1434,9 +1435,9 @@ struct mount *copy_tree(struct mount *mnt, struct dentry *dentry,
s = skip_mnt_tree(s);
continue;
}
while (p != real_mount(s->mnt.mnt_parent)) {
p = real_mount(p->mnt.mnt_parent);
q = real_mount(q->mnt.mnt_parent);
while (p != real_mount(s->mnt_parent)) {
p = real_mount(p->mnt_parent);
q = real_mount(q->mnt_parent);
}
p = s;
path.mnt = &q->mnt;
Expand Down Expand Up @@ -1898,7 +1899,7 @@ static int do_move_mount(struct path *path, char *old_name)
/*
* Don't move a mount residing in a shared parent.
*/
if (IS_MNT_SHARED(old_path.mnt->mnt_parent))
if (IS_MNT_SHARED(old->mnt_parent))
goto out1;
/*
* Don't move a mount tree containing unbindable mounts to a destination
Expand All @@ -1908,7 +1909,7 @@ static int do_move_mount(struct path *path, char *old_name)
tree_contains_unbindable(old))
goto out1;
err = -ELOOP;
for (p = real_mount(path->mnt); mnt_has_parent(p); p = real_mount(p->mnt.mnt_parent))
for (p = real_mount(path->mnt); mnt_has_parent(p); p = real_mount(p->mnt_parent))
if (p == old)
goto out1;

Expand Down Expand Up @@ -2158,7 +2159,7 @@ static int select_submounts(struct mount *parent, struct list_head *graveyard)
*/
if (this_parent != parent) {
next = this_parent->mnt.mnt_child.next;
this_parent = real_mount(this_parent->mnt.mnt_parent);
this_parent = real_mount(this_parent->mnt_parent);
goto resume;
}
return found;
Expand Down Expand Up @@ -2564,7 +2565,7 @@ bool is_path_reachable(struct mount *mnt, struct dentry *dentry,
{
while (&mnt->mnt != root->mnt && mnt_has_parent(mnt)) {
dentry = mnt->mnt.mnt_mountpoint;
mnt = real_mount(mnt->mnt.mnt_parent);
mnt = real_mount(mnt->mnt_parent);
}
return &mnt->mnt == root->mnt && is_subdir(dentry, root->dentry);
}
Expand Down Expand Up @@ -2635,8 +2636,8 @@ SYSCALL_DEFINE2(pivot_root, const char __user *, new_root,
new_mnt = real_mount(new.mnt);
root_mnt = real_mount(root.mnt);
if (IS_MNT_SHARED(old.mnt) ||
IS_MNT_SHARED(new.mnt->mnt_parent) ||
IS_MNT_SHARED(root.mnt->mnt_parent))
IS_MNT_SHARED(new_mnt->mnt_parent) ||
IS_MNT_SHARED(root_mnt->mnt_parent))
goto out4;
if (!check_mnt(root.mnt) || !check_mnt(new.mnt))
goto out4;
Expand Down
4 changes: 2 additions & 2 deletions trunk/fs/pnode.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ int propagate_mount_busy(struct mount *mnt, int refcnt)
{
struct vfsmount *m;
struct mount *child;
struct vfsmount *parent = mnt->mnt.mnt_parent;
struct vfsmount *parent = mnt->mnt_parent;
int ret = 0;

if (&mnt->mnt == parent)
Expand Down Expand Up @@ -322,7 +322,7 @@ int propagate_mount_busy(struct mount *mnt, int refcnt)
*/
static void __propagate_umount(struct mount *mnt)
{
struct vfsmount *parent = mnt->mnt.mnt_parent;
struct vfsmount *parent = mnt->mnt_parent;
struct vfsmount *m;

BUG_ON(parent == &mnt->mnt);
Expand Down
1 change: 0 additions & 1 deletion trunk/include/linux/mount.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ struct mnt_pcp {
};

struct vfsmount {
struct vfsmount *mnt_parent; /* fs we are mounted on */
struct dentry *mnt_mountpoint; /* dentry of mountpoint */
struct dentry *mnt_root; /* root of the mounted tree */
struct super_block *mnt_sb; /* pointer to superblock */
Expand Down

0 comments on commit 4356bc6

Please sign in to comment.