Unverified Commit 7fc71173 authored by Al Viro's avatar Al Viro Committed by Christian Brauner
Browse files

->mnt_devname is never NULL 



Not since 8f291889 "new helpers: vfs_create_mount(), fc_mount()"
back in 2018.  Get rid of the dead checks...

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Link: https://lore.kernel.org/20250421033509.GV2023217@ZenIV


Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent a68cb186

fs/namespace.c

+7 −6
Original line number Diff line number Diff line
@@ -355,12 +355,13 @@ static struct mount *alloc_vfsmnt(const char *name) 
		if (err)

			goto out_free_cache;



		if (name) {

		if (name)

			mnt->mnt_devname = kstrdup_const(name,

							 GFP_KERNEL_ACCOUNT);

		else

			mnt->mnt_devname = "none";

		if (!mnt->mnt_devname)

			goto out_free_id;

		}



#ifdef CONFIG_SMP

		mnt->mnt_pcp = alloc_percpu(struct mnt_pcp);
@@ -1268,7 +1269,7 @@ struct vfsmount *vfs_create_mount(struct fs_context *fc) 
	if (!fc->root)

		return ERR_PTR(-EINVAL);



	mnt = alloc_vfsmnt(fc->source ?: "none");

	mnt = alloc_vfsmnt(fc->source);

	if (!mnt)

		return ERR_PTR(-ENOMEM);
@@ -5483,7 +5484,7 @@ static int statmount_sb_source(struct kstatmount *s, struct seq_file *seq) 
		seq->buf[seq->count] = '\0';

		seq->count = start;

		seq_commit(seq, string_unescape_inplace(seq->buf + start, UNESCAPE_OCTAL));

	} else if (r->mnt_devname) {

	} else {

		seq_puts(seq, r->mnt_devname);

	}

	return 0;

fs/proc_namespace.c

+4 −8
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ static int show_vfsmnt(struct seq_file *m, struct vfsmount *mnt) 
		if (err)

			goto out;

	} else {

		mangle(m, r->mnt_devname ? r->mnt_devname : "none");

		mangle(m, r->mnt_devname);

	}

	seq_putc(m, ' ');

	/* mountpoints outside of chroot jail will give SEQ_SKIP on this */
@@ -177,7 +177,7 @@ static int show_mountinfo(struct seq_file *m, struct vfsmount *mnt) 
		if (err)

			goto out;

	} else {

		mangle(m, r->mnt_devname ? r->mnt_devname : "none");

		mangle(m, r->mnt_devname);

	}

	seq_puts(m, sb_rdonly(sb) ? " ro" : " rw");

	err = show_sb_opts(m, sb);
@@ -199,17 +199,13 @@ static int show_vfsstat(struct seq_file *m, struct vfsmount *mnt) 
	int err;



	/* device */

	if (sb->s_op->show_devname) {

	seq_puts(m, "device ");

	if (sb->s_op->show_devname) {

		err = sb->s_op->show_devname(m, mnt_path.dentry);

		if (err)

			goto out;

	} else {

		if (r->mnt_devname) {

			seq_puts(m, "device ");

		mangle(m, r->mnt_devname);

		} else

			seq_puts(m, "no device");

	}



	/* mount point */