diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2011-11-25 04:19:58 +0100 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-01-04 04:57:05 +0100 |
| commit | 0714a533805a0f8ebfc6fdb6bda9f129b8c7c6d7 (patch) | |
| tree | 7f34ceedc12c4a680ca3509562b09ec441a0954f /fs/dcache.c | |
| parent | vfs: mnt_parent moved to struct mount (diff) | |
| download | linux-0714a533805a0f8ebfc6fdb6bda9f129b8c7c6d7.tar.xz linux-0714a533805a0f8ebfc6fdb6bda9f129b8c7c6d7.zip | |
vfs: now it can be done - make mnt_parent point to struct mount
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/dcache.c')
| -rw-r--r-- | fs/dcache.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/dcache.c b/fs/dcache.c index eef2d5472f9c..98b48753f77b 100644 --- a/fs/dcache.c +++ b/fs/dcache.c @@ -2452,6 +2452,7 @@ static int prepend_path(const struct path *path, { struct dentry *dentry = path->dentry; struct vfsmount *vfsmnt = path->mnt; + struct mount *mnt = real_mount(vfsmnt); bool slash = false; int error = 0; @@ -2460,12 +2461,12 @@ static int prepend_path(const struct path *path, struct dentry * parent; if (dentry == vfsmnt->mnt_root || IS_ROOT(dentry)) { - struct mount *mnt = real_mount(vfsmnt); /* Global root? */ if (!mnt_has_parent(mnt)) goto global_root; - dentry = vfsmnt->mnt_mountpoint; - vfsmnt = mnt->mnt_parent; + dentry = mnt->mnt.mnt_mountpoint; + mnt = mnt->mnt_parent; + vfsmnt = &mnt->mnt; continue; } parent = dentry->d_parent; |