From patchwork Mon Jan 11 15:37:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Dmitry V. Levin" X-Patchwork-Id: 8006311 Return-Path: X-Original-To: patchwork-linux-fsdevel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 009AEBEEE5 for ; Mon, 11 Jan 2016 15:45:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0B9F620295 for ; Mon, 11 Jan 2016 15:45:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 13AFD202DD for ; Mon, 11 Jan 2016 15:45:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760485AbcAKPpI (ORCPT ); Mon, 11 Jan 2016 10:45:08 -0500 Received: from pegasus3.altlinux.org ([194.107.17.103]:38535 "EHLO pegasus3.altlinux.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759762AbcAKPpG (ORCPT ); Mon, 11 Jan 2016 10:45:06 -0500 Received: from mua.local.altlinux.org (mua.local.altlinux.org [192.168.1.14]) by pegasus3.altlinux.org (Postfix) with ESMTP id 7F78380A99; Mon, 11 Jan 2016 18:37:17 +0300 (MSK) Received: by mua.local.altlinux.org (Postfix, from userid 508) id 75E3EAC42D1; Mon, 11 Jan 2016 18:37:17 +0300 (MSK) Date: Mon, 11 Jan 2016 18:37:17 +0300 From: "Dmitry V. Levin" To: Alexander Viro Cc: Mateusz Guzik , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [RESEND PATCH 3/3] vfs: show_vfsstat: remove redundant initialization and check of error code Message-ID: <20160111153717.GD30070@altlinux.org> References: <20150319113043.GC11802@altlinux.org> <20151118174248.GA13411@altlinux.org> <20151118180213.GA9688@mguzik> <20151118215832.GC15460@altlinux.org> Mime-Version: 1.0 Content-Disposition: inline In-Reply-To: <20151118215832.GC15460@altlinux.org> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Date: Wed Nov 18 21:09:45 2015 +0000 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. Suggested-by: Mateusz Guzik Signed-off-by: Dmitry V. Levin --- fs/proc_namespace.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/fs/proc_namespace.c b/fs/proc_namespace.c index 7a6b2f3..3f1190d 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) { @@ -224,8 +224,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');