From patchwork Wed Oct 15 23:14:20 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zach Brown X-Patchwork-Id: 5087461 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 37561C11AC for ; Wed, 15 Oct 2014 23:14:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7BEB42012E for ; Wed, 15 Oct 2014 23:14:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 93D0920136 for ; Wed, 15 Oct 2014 23:14:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751364AbaJOXOw (ORCPT ); Wed, 15 Oct 2014 19:14:52 -0400 Received: from mail-wg0-f45.google.com ([74.125.82.45]:42455 "EHLO mail-wg0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751306AbaJOXOv (ORCPT ); Wed, 15 Oct 2014 19:14:51 -0400 Received: by mail-wg0-f45.google.com with SMTP id m15so2429363wgh.28 for ; Wed, 15 Oct 2014 16:14:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=by6uydNOqayBirtQgxrzdp2kbiSRn1VybQs1Ec/EPzE=; b=P//smi1bTsbnfhkbRgxt1N1gWEQIewxQY3ADQJgEDBWsnIVe9+NyJOicY18wWpOJkG P/uqk/RfdWGGFYuvDwc8wpg2JbXJr6zcYezEIX7vsxpXuTYskK2eBN5Qs/hDrWUVE8sx O72X65I2uXEDPWB0tH1Jegdi6Za+rHWXiHcxbKUF81B9SCkVn5Y27BwzbBYXMNEV4RMJ +D3o04I3fqszCefPFKd9dN5MIA4iDVJx5My2mEi2UHGlJD73JksJVkjP4Cxq9qKaa+4V dZEw/rgMK+k8/wIzChuE7yBdO0R365vY7nwTKMKKHqnko1nEiTK1oBw0GZD6WGmesrmj 95Kg== X-Gm-Message-State: ALoCoQnzmETtgQpt+hDvCVtu1Q0bV6hQnv4VPUHtqzXyOJXiveWI2uVPUH4nOSH6ueas0ktnirM8 X-Received: by 10.194.206.36 with SMTP id ll4mr15820966wjc.21.1413414890297; Wed, 15 Oct 2014 16:14:50 -0700 (PDT) Received: from lenny.home.zabbo.net (tetsuo.zabbo.net. [50.193.208.193]) by mx.google.com with ESMTPSA id o1sm25390716wja.25.2014.10.15.16.14.48 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Oct 2014 16:14:49 -0700 (PDT) From: Zach Brown To: linux-btrfs@vger.kernel.org, David Sterba Subject: [PATCH 3/4] btrfs-progs: fix show super unknown flag output Date: Wed, 15 Oct 2014 16:14:20 -0700 Message-Id: <1413414861-28097-4-git-send-email-zab@zabbo.net> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1413414861-28097-1-git-send-email-zab@zabbo.net> References: <1413414861-28097-1-git-send-email-zab@zabbo.net> Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-5.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY, URIBL_WS_SURBL 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 coverity pointed out that unknown flag printing in show super had some dead code. It turns out that first was reset when the first flag was tested, not when it was output. We only want to clear it if the first matching bit is output. If there are no matching bits then we'll want to output the unknown flag first. Signed-off-by: Zach Brown --- btrfs-show-super.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/btrfs-show-super.c b/btrfs-show-super.c index 456dbd8..2b48f44 100644 --- a/btrfs-show-super.c +++ b/btrfs-show-super.c @@ -324,8 +324,8 @@ static void print_readable_incompat_flag(u64 flag) printf("%s ", entry->output); else printf("|\n\t\t\t %s ", entry->output); + first = 0; } - first = 0; } flag &= ~BTRFS_FEATURE_INCOMPAT_SUPP; if (flag) {