vfs: cleanup show_mountinfo (9ad4dc4f) · Commits · 戴 / test

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>

fs/proc_namespace.c

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -125,7 +125,6 @@ static int show_mountinfo(struct seq_file m, struct vfsmount mnt)
	struct mount *r = real_mount(mnt);		struct mount *r = real_mount(mnt);
	struct super_block *sb = mnt->mnt_sb;		struct super_block *sb = mnt->mnt_sb;
	struct path mnt_path = { .dentry = mnt->mnt_root, .mnt = mnt };		struct path mnt_path = { .dentry = mnt->mnt_root, .mnt = mnt };
	struct path root = p->root;
	int err = 0;		int err = 0;

	seq_printf(m, "%i %i %u:%u ", r->mnt_id, r->mnt_parent->mnt_id,		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, ' ');		seq_putc(m, ' ');

	/* mountpoints outside of chroot jail will give SEQ_SKIP on this */		/* 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)		if (err)
	goto out;		goto out;

Admin message