public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-18 22:14:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

->mnt_devname is never NULL

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

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Link: https://lore.kernel.org/20250421033509.GV2023217@ZenIV
Signed-off-by: Christian Brauner <brauner@kernel.org>
This commit is contained in:
Al Viro 2025-04-21 04:35:09 +01:00 • committed by Christian Brauner
parent a68cb18624
commit 7fc711739e
No known key found for this signature in database
GPG key ID: 91C61BC06578DCA2
2 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
fs/namespace.c
View file

@ -355,12 +355,13 @@ static struct mount *alloc_vfsmnt(const char *name)
if (err) if (err)
goto out_free_cache; goto out_free_cache;
if (name) { if (name)
mnt->mnt_devname = kstrdup_const(name, mnt->mnt_devname = kstrdup_const(name,
GFP_KERNEL_ACCOUNT); GFP_KERNEL_ACCOUNT);
if (!mnt->mnt_devname) else
goto out_free_id; mnt->mnt_devname = "none";
} if (!mnt->mnt_devname)
goto out_free_id;
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
mnt->mnt_pcp = alloc_percpu(struct mnt_pcp); mnt->mnt_pcp = alloc_percpu(struct mnt_pcp);
@ -1268,7 +1269,7 @@ struct vfsmount *vfs_create_mount(struct fs_context *fc)
if (!fc->root) if (!fc->root)
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
mnt = alloc_vfsmnt(fc->source ?: "none"); mnt = alloc_vfsmnt(fc->source);
if (!mnt) if (!mnt)
return ERR_PTR(-ENOMEM); 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->buf[seq->count] = '\0';
seq->count = start; seq->count = start;
seq_commit(seq, string_unescape_inplace(seq->buf + start, UNESCAPE_OCTAL)); seq_commit(seq, string_unescape_inplace(seq->buf + start, UNESCAPE_OCTAL));
} else if (r->mnt_devname) { } else {
seq_puts(seq, r->mnt_devname); seq_puts(seq, r->mnt_devname);
} }
return 0; return 0;

12
fs/proc_namespace.c
View file

@ -111,7 +111,7 @@ static int show_vfsmnt(struct seq_file *m, struct vfsmount *mnt)
if (err) if (err)
goto out; goto out;
} else { } else {
mangle(m, r->mnt_devname ? r->mnt_devname : "none"); mangle(m, r->mnt_devname);
} }
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 */
@ -177,7 +177,7 @@ static int show_mountinfo(struct seq_file *m, struct vfsmount *mnt)
if (err) if (err)
goto out; goto out;
} else { } else {
mangle(m, r->mnt_devname ? r->mnt_devname : "none"); mangle(m, r->mnt_devname);
} }
seq_puts(m, sb_rdonly(sb) ? " ro" : " rw"); seq_puts(m, sb_rdonly(sb) ? " ro" : " rw");
err = show_sb_opts(m, sb); err = show_sb_opts(m, sb);
@ -199,17 +199,13 @@ static int show_vfsstat(struct seq_file *m, struct vfsmount *mnt)
int err; int err;
/* device */ /* device */
seq_puts(m, "device ");
if (sb->s_op->show_devname) { if (sb->s_op->show_devname) {
seq_puts(m, "device ");
err = sb->s_op->show_devname(m, mnt_path.dentry); err = sb->s_op->show_devname(m, mnt_path.dentry);
if (err) if (err)
goto out; goto out;
} else { } else {
if (r->mnt_devname) { mangle(m, r->mnt_devname);
seq_puts(m, "device ");
mangle(m, r->mnt_devname);
} else
seq_puts(m, "no device");
} }
/* mount point */ /* mount point */