From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753302AbdAZJVL (ORCPT ); Thu, 26 Jan 2017 04:21:11 -0500 Received: from mail3-relais-sop.national.inria.fr ([192.134.164.104]:16866 "EHLO mail3-relais-sop.national.inria.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752935AbdAZJVJ (ORCPT ); Thu, 26 Jan 2017 04:21:09 -0500 X-IronPort-AV: E=Sophos;i="5.33,288,1477954800"; d="scan'208";a="210985022" Date: Thu, 26 Jan 2017 10:20:58 +0100 (CET) From: Julia Lawall X-X-Sender: jll@hadrien To: "Darrick J. Wong" cc: linux-xfs@vger.kernel.org, linux-kernel@vger.kernel.org, kbuild-all@01.org Subject: [PATCH] xfs: fix returnvar.cocci warnings Message-ID: User-Agent: Alpine 2.20 (DEB 67 2015-01-07) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Remove unneeded variable used to store return value. Generated by: scripts/coccinelle/misc/returnvar.cocci Signed-off-by: Fengguang Wu --- Is it correct to be returning 0 in the level == 0 case? dabtree.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) --- a/fs/xfs/scrub/dabtree.c +++ b/fs/xfs/scrub/dabtree.c @@ -96,7 +96,6 @@ xfs_scrub_da_btree_hash( struct xfs_da_node_entry *btree; xfs_dahash_t hash; xfs_dahash_t parent_hash; - int error = 0; /* Is this hash in order? */ hash = be32_to_cpu(*hashp); @@ -104,7 +103,7 @@ xfs_scrub_da_btree_hash( ds->hashes[level] = hash; if (level == 0) - return error; + return 0; /* Is this hash no larger than the parent hash? */ blks = ds->state->path.blk; @@ -112,7 +111,7 @@ xfs_scrub_da_btree_hash( parent_hash = be32_to_cpu(btree->hashval); XFS_SCRUB_DA_CHECK(ds, hash <= parent_hash); - return error; + return 0; } /* Scrub a da btree pointer. */ @@ -122,12 +121,10 @@ xfs_scrub_da_btree_ptr( int level, xfs_dablk_t blkno) { - int error = 0; - XFS_SCRUB_DA_CHECK(ds, blkno >= ds->lowest); XFS_SCRUB_DA_CHECK(ds, ds->highest == 0 || blkno < ds->highest); - return error; + return 0; } /*