summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorDmitry V. Levin <ldv@altlinux.org>2012-10-17 20:29:36 +0400
committerAl Viro <viro@zeniv.linux.org.uk>2014-12-17 08:27:15 -0500
commit9ad4dc4f7318080e2e4e0cd23623211a20d33861 (patch)
tree21583c59652b5e9a3a367e051185775b65ac787f /fs
parent10975933da3d65f8833d4ce98dcc2ecc63a695d6 (diff)
vfs: cleanup show_mountinfo
Starting with commit v3.2-rc4-1-g02125a8, seq_path_root() no longer changes the value of its "struct path *root" argument. Starting with commit v3.2-rc7-104-g8c9379e, the "struct path *root" argument of seq_path_root() is const. As result, the temporary variable "root" in show_mountinfo() that holds a copy of struct path root is no longer needed. Signed-off-by: Dmitry V. Levin <ldv@altlinux.org> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
-rw-r--r--fs/proc_namespace.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/proc_namespace.c b/fs/proc_namespace.c
index 73ca1740d839..789e8d1e21db 100644
--- a/fs/proc_namespace.c
+++ b/fs/proc_namespace.c
@@ -125,7 +125,6 @@ static int show_mountinfo(struct seq_file *m, struct vfsmount *mnt)
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 ", r->mnt_id, r->mnt_parent->mnt_id,
@@ -139,7 +138,7 @@ static int show_mountinfo(struct seq_file *m, struct vfsmount *mnt)
seq_putc(m, ' ');
/* mountpoints outside of chroot jail will give SEQ_SKIP on this */
- err = seq_path_root(m, &mnt_path, &root, " \t\n\\");
+ err = seq_path_root(m, &mnt_path, &p->root, " \t\n\\");
if (err)
goto out;