summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry V. Levin <ldv@altlinux.org>2015-11-19 00:58:32 +0300
committerAl Viro <viro@zeniv.linux.org.uk>2015-12-06 21:17:16 -0500
commitb896fb35ca904fe5b7765fcd81a45f09a62e8d03 (patch)
treee9195ac2f2cbb8344617ce717190495e0675650a
parent6ce4bca0adfde9ee404ce659d110f2bdeff9c13b (diff)
downloadop-kernel-dev-b896fb35ca904fe5b7765fcd81a45f09a62e8d03.zip
op-kernel-dev-b896fb35ca904fe5b7765fcd81a45f09a62e8d03.tar.gz
vfs: show_vfsstat: remove redundant initialization and check of error code
As err variable is now always checked right after each assignment, its initialization is redundant and could be safely removed. For the same reason, the last check of err is also redundant and could be removed as well. Signed-off-by: Dmitry V. Levin <ldv@altlinux.org> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--fs/proc_namespace.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/proc_namespace.c b/fs/proc_namespace.c
index 9363758..2256e7e 100644
--- a/fs/proc_namespace.c
+++ b/fs/proc_namespace.c
@@ -193,7 +193,7 @@ static int show_vfsstat(struct seq_file *m, struct vfsmount *mnt)
struct mount *r = real_mount(mnt);
struct path mnt_path = { .dentry = mnt->mnt_root, .mnt = mnt };
struct super_block *sb = mnt_path.dentry->d_sb;
- int err = 0;
+ int err;
/* device */
if (sb->s_op->show_devname) {
@@ -222,8 +222,7 @@ static int show_vfsstat(struct seq_file *m, struct vfsmount *mnt)
/* optional statistics */
if (sb->s_op->show_stats) {
seq_putc(m, ' ');
- if (!err)
- err = sb->s_op->show_stats(m, mnt_path.dentry);
+ err = sb->s_op->show_stats(m, mnt_path.dentry);
}
seq_putc(m, '\n');
OpenPOWER on IntegriCloud