[RESEND v4 PATCH 1/2] vfs: cleanup show_mountinfo

2014-12-15 Thread Dmitry V. Levin
Date: Wed, 17 Oct 2012 20:29:36 +0400

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 
---
 fs/proc_namespace.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/fs/proc_namespace.c b/fs/proc_namespace.c
index 73ca174..789e8d1 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, _path, , " \t\n\\");
+   err = seq_path_root(m, _path, >root, " \t\n\\");
if (err)
goto out;
 
-- 
ldv
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


[RESEND v4 PATCH 1/2] vfs: cleanup show_mountinfo

2014-12-15 Thread Dmitry V. Levin
Date: Wed, 17 Oct 2012 20:29:36 +0400

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 l...@altlinux.org
---
 fs/proc_namespace.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/fs/proc_namespace.c b/fs/proc_namespace.c
index 73ca174..789e8d1 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;
 
-- 
ldv
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/