[PATCH 10/14] d_path: prepend_path(): get rid of vfsmnt
From: Al Viro <viro@zeniv.linux.org.uk>
Date: 2021-05-19 00:51:07
Also in:
linux-fsdevel, linux-s390, lkml
Subsystem:
filesystems (vfs and infrastructure), the rest · Maintainers:
Alexander Viro, Christian Brauner, Linus Torvalds
it's kept equal to &mnt->mnt all along. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> --- fs/d_path.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/fs/d_path.c b/fs/d_path.c
index 06e93dd031bf..3836f5d0b023 100644
--- a/fs/d_path.c
+++ b/fs/d_path.c@@ -90,7 +90,6 @@ static int prepend_path(const struct path *path, struct prepend_buffer *p) { struct dentry *dentry; - struct vfsmount *vfsmnt; struct mount *mnt; int error = 0; unsigned seq, m_seq = 0;
@@ -105,18 +104,17 @@ static int prepend_path(const struct path *path, b = *p; error = 0; dentry = path->dentry; - vfsmnt = path->mnt; - mnt = real_mount(vfsmnt); + mnt = real_mount(path->mnt); read_seqbegin_or_lock(&rename_lock, &seq); - while (dentry != root->dentry || vfsmnt != root->mnt) { + while (dentry != root->dentry || &mnt->mnt != root->mnt) { struct dentry * parent; - if (dentry == vfsmnt->mnt_root || IS_ROOT(dentry)) { + if (dentry == mnt->mnt.mnt_root || IS_ROOT(dentry)) { struct mount *parent = READ_ONCE(mnt->mnt_parent); struct mnt_namespace *mnt_ns; /* Escaped? */ - if (dentry != vfsmnt->mnt_root) { + if (dentry != mnt->mnt.mnt_root) { b = *p; error = 3; break;
@@ -125,7 +123,6 @@ static int prepend_path(const struct path *path, if (mnt != parent) { dentry = READ_ONCE(mnt->mnt_mountpoint); mnt = parent; - vfsmnt = &mnt->mnt; continue; } mnt_ns = READ_ONCE(mnt->mnt_ns);
--
2.11.0