diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2025-04-21 04:35:09 +0100 |
|---|---|---|
| committer | Christian Brauner <brauner@kernel.org> | 2025-05-23 14:20:44 +0200 |
| commit | 7fc711739eb8c30955fd8a85be0db7d5a0aa10ae (patch) | |
| tree | ee027ae22fa71de1bebbe55fd0bfbe2cc2e6e381 /fs/proc_namespace.c | |
| parent | mount: add a comment about concurrent changes with statmount()/listmount() (diff) | |
| download | linux-7fc711739eb8c30955fd8a85be0db7d5a0aa10ae.tar.gz linux-7fc711739eb8c30955fd8a85be0db7d5a0aa10ae.zip | |
->mnt_devname is never NULL
Not since 8f2918898eb5 "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>
Diffstat (limited to '')
| -rw-r--r-- | fs/proc_namespace.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/fs/proc_namespace.c b/fs/proc_namespace.c index e133b507ddf3..5c555db68aa2 100644 --- a/fs/proc_namespace.c +++ b/fs/proc_namespace.c @@ -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 */ + seq_puts(m, "device "); if (sb->s_op->show_devname) { - seq_puts(m, "device "); 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"); + mangle(m, r->mnt_devname); } /* mount point */ |