Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp1058038ybi; Fri, 31 May 2019 13:07:23 -0700 (PDT) X-Google-Smtp-Source: APXvYqx+N5Q4FtZmMM5UxxFqzmgHhiQdP3litJid9wIW6TX0X15aAlnvrojJDI9ZipN1p97MJa5b X-Received: by 2002:a62:d41c:: with SMTP id a28mr12569675pfh.31.1559333243366; Fri, 31 May 2019 13:07:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559333243; cv=none; d=google.com; s=arc-20160816; b=Xa3EVjs0lfmh+zom/bMmKoW+YE/WDQix3MWeAk54aG/O/PREdUyWteXDIDhbQkZQM/ V0HpHLHsA5NicjhS8DoOe98fyi/97GEGOZScwfSkD0mTPQsRCB/ZjIAe06BBmQkXC5Pl xtSs2UoJgXttc2BUbWfKX24mKfUuH2N8+HXWNWt+N8EccE//mHXqAv3kL5QZTlLiwXUr lB6L/jYCZXI4w4briWOgtus7RDKclFuW6T9ksR6zWgJrnmRgZUll5cJaDxV5+qHV1Aue awLS7hmfxEr+redKBnAHSXV/6lwgbea6wOlYd0j5DQCIcHCKl0Akc/neFE5Zbq7tt3Dt cadQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:date:cc:to:from:subject :message-id; bh=RYZnp6X9x0t8ZK0SgMSTKVahkgbcIHi2K8pnAbICmV4=; b=BKeiV0IAbbiTMgTA38iyemW1SWqAAWFuowUMQnB2vZCJphIG9DgbkBDMjf5BfH3Q3O EGdHnekT7Gmx+o1pQWX+JmclIVAmZsSfwP2SdcX4CntQp/HUipx/cf1gCCm1+Sgbg/3o Mjhsf285J8ByCRScQ5paYp/G5AgjNo0JlZGlhaXF733BdVkyg258wQuW411OZCLzAPti UYc1npGiN/c8nRdkLvvaofFWzmI1jjw0+wHt14GnYJ5pYOzc+1eqs6bm5JlpXdr6ajFI Tv83SCsUYa7kNzk3PSuiy1uj/0OW6N1GuVvcH8/eTlpTN+BYzHN+FzTk5nk67BCgBgvu 1FcA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id j40si7723577plb.352.2019.05.31.13.07.06; Fri, 31 May 2019 13:07:23 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727459AbfEaUFq (ORCPT + 99 others); Fri, 31 May 2019 16:05:46 -0400 Received: from smtprelay0171.hostedemail.com ([216.40.44.171]:55333 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727287AbfEaUFq (ORCPT ); Fri, 31 May 2019 16:05:46 -0400 Received: from filter.hostedemail.com (clb03-v110.bra.tucows.net [216.40.38.60]) by smtprelay02.hostedemail.com (Postfix) with ESMTP id 94FE640D7; Fri, 31 May 2019 20:05:44 +0000 (UTC) X-Session-Marker: 6A6F6540706572636865732E636F6D X-Spam-Summary: 2,0,0,,d41d8cd98f00b204,joe@perches.com,:::::::::::,RULES_HIT:41:355:379:599:988:989:1260:1277:1311:1313:1314:1345:1359:1437:1515:1516:1518:1534:1541:1593:1594:1711:1730:1747:1777:1792:2393:2559:2562:2828:3138:3139:3140:3141:3142:3352:3622:3868:3870:4321:5007:7875:10004:10400:10848:11026:11232:11658:11914:12048:12114:12296:12555:12740:12760:12895:13069:13161:13229:13311:13357:13439:14659:14721:14915:21080:21627:30054:30091,0,RBL:23.242.196.136:@perches.com:.lbl8.mailshell.net-62.8.0.180 64.201.201.201,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fn,MSBL:0,DNSBL:neutral,Custom_rules:0:0:0,LFtime:25,LUA_SUMMARY:none X-HE-Tag: milk45_14de4368b0321 X-Filterd-Recvd-Size: 2042 Received: from XPS-9350.home (cpe-23-242-196-136.socal.res.rr.com [23.242.196.136]) (Authenticated sender: joe@perches.com) by omf17.hostedemail.com (Postfix) with ESMTPA; Fri, 31 May 2019 20:05:43 +0000 (UTC) Message-ID: Subject: Re: [PATCH] btrfs: Fix -Wunused-but-set-variable warnings From: Joe Perches To: Andrey Abramov , clm@fb.com, josef@toxicpanda.com, dsterba@suse.com Cc: linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org Date: Fri, 31 May 2019 13:05:41 -0700 In-Reply-To: <20190531195349.31129-1-st5pub@yandex.ru> References: <20190531195349.31129-1-st5pub@yandex.ru> Content-Type: text/plain; charset="ISO-8859-1" User-Agent: Evolution 3.30.1-1build1 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 2019-05-31 at 22:53 +0300, Andrey Abramov wrote: > Fix -Wunused-but-set-variable warnings in raid56.c and sysfs.c files trivia: > diff --git a/fs/btrfs/raid56.c b/fs/btrfs/raid56.c > index f3d0576dd327..4ab29eacfdf3 100644 > --- a/fs/btrfs/raid56.c > +++ b/fs/btrfs/raid56.c > @@ -1182,22 +1182,17 @@ static noinline void finish_rmw(struct btrfs_raid_bio *rbio) > int nr_data = rbio->nr_data; > int stripe; > int pagenr; > - int p_stripe = -1; > - int q_stripe = -1; > + int is_q_stripe = 0; These uses seem boolean, so perhaps just use bool? > + if (rbio->real_stripes - rbio->nr_data == 2) > + is_q_stripe = 1; [] > @@ -1241,7 +1236,7 @@ static noinline void finish_rmw(struct btrfs_raid_bio *rbio) [] > + if (is_q_stripe) { > @@ -2340,8 +2335,7 @@ static noinline void finish_parity_scrub(struct btrfs_raid_bio *rbio, [] > + int is_q_stripe = 0; > @@ -2351,14 +2345,10 @@ static noinline void finish_parity_scrub(struct btrfs_raid_bio *rbio, > + if (rbio->real_stripes - rbio->nr_data == 2) > + is_q_stripe = 1; [] > @@ -2380,7 +2370,7 @@ static noinline void finish_parity_scrub(struct btrfs_raid_bio *rbio, [] > + if (is_q_stripe) {