From patchwork Fri Mar 13 08:45:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Roger_Pau_Monn=C3=A9?= X-Patchwork-Id: 11436277 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 94F051668 for ; Fri, 13 Mar 2020 08:47:41 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 71AAE20749 for ; Fri, 13 Mar 2020 08:47:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=citrix.com header.i=@citrix.com header.b="efcd2Zww" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 71AAE20749 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=citrix.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1jCfxU-0006hY-4F; Fri, 13 Mar 2020 08:46:20 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1jCfxS-0006hT-Pp for xen-devel@lists.xenproject.org; Fri, 13 Mar 2020 08:46:18 +0000 X-Inumbo-ID: 1a1a4ab1-6507-11ea-b2a1-12813bfff9fa Received: from esa3.hc3370-68.iphmx.com (unknown [216.71.145.155]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 1a1a4ab1-6507-11ea-b2a1-12813bfff9fa; Fri, 13 Mar 2020 08:46:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1584089177; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=m08kbuS3+yrVjizwQSwITM0tS6ODUV6LCxVv0Nvv75A=; b=efcd2Zww/tvi5xQSTqhOXqDNlmsZWE8nSqRcOjjxf7EHvgdTB+vbaG8K oTJq8w08JvNAPEFyHucnMFTG/JOEupKV1AO94AmUQKdt0WlltscHLtiRi a921fxtF/VwUEj/RxoKRzFz2EtCFgHhUS9GRzq1ZFXYaWzoumK66//8ix 0=; Authentication-Results: esa3.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none; spf=None smtp.pra=roger.pau@citrix.com; spf=Pass smtp.mailfrom=roger.pau@citrix.com; spf=None smtp.helo=postmaster@mail.citrix.com Received-SPF: None (esa3.hc3370-68.iphmx.com: no sender authenticity information available from domain of roger.pau@citrix.com) identity=pra; client-ip=162.221.158.21; receiver=esa3.hc3370-68.iphmx.com; envelope-from="roger.pau@citrix.com"; x-sender="roger.pau@citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa3.hc3370-68.iphmx.com: domain of roger.pau@citrix.com designates 162.221.158.21 as permitted sender) identity=mailfrom; client-ip=162.221.158.21; receiver=esa3.hc3370-68.iphmx.com; envelope-from="roger.pau@citrix.com"; x-sender="roger.pau@citrix.com"; x-conformance=sidf_compatible; x-record-type="v=spf1"; x-record-text="v=spf1 ip4:209.167.231.154 ip4:178.63.86.133 ip4:195.66.111.40/30 ip4:85.115.9.32/28 ip4:199.102.83.4 ip4:192.28.146.160 ip4:192.28.146.107 ip4:216.52.6.88 ip4:216.52.6.188 ip4:162.221.158.21 ip4:162.221.156.83 ip4:168.245.78.127 ~all" Received-SPF: None (esa3.hc3370-68.iphmx.com: no sender authenticity information available from domain of postmaster@mail.citrix.com) identity=helo; client-ip=162.221.158.21; receiver=esa3.hc3370-68.iphmx.com; envelope-from="roger.pau@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: PZykW2Wv2+zF3iqZl4xWhYsh3GZ1F2yOsfvzxHQhjWAFXee6spBc///T6KD4OelW/Rw3vHVxYz PLdDz+FD8J+EBEPglwyKgIN53PKKta+xO+RQnV0uviAakFNL0TqdMuNd77SQZzAJpxYMpwp/05 rUPSf6vyDrNfjjDio6JcVudU8y3qouCnX8/FT+2kihnB4nGL9tjrXSnWZGtLk0/YqMX+yIRk0U JtT4L4vMLst8UcRUeVeMbL9IBcOOZfSE5+3HmatL6P5B2qVH7ZQR0YbsGn8UEU+XUxlFgG+qe8 jdU= X-SBRS: 2.7 X-MesageID: 13878922 X-Ironport-Server: esa3.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.70,548,1574139600"; d="scan'208";a="13878922" From: Roger Pau Monne To: Date: Fri, 13 Mar 2020 09:45:57 +0100 Message-ID: <20200313084558.13759-1-roger.pau@citrix.com> X-Mailer: git-send-email 2.25.0 MIME-Version: 1.0 Subject: [Xen-devel] [PATCH 1/2] libfsimage: fix clang 10 build X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Ian Jackson , Wei Liu , Roger Pau Monne Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" clang complains with: fsys_zfs.c:826:2: error: converting the enum constant to a boolean [-Werror,-Wint-in-bool-context] VERIFY_DN_TYPE(dn, DMU_OT_PLAIN_FILE_CONTENTS); ^ /wrkdirs/usr/ports/sysutils/xen-tools/work/xen-4.13.0/tools/libfsimage/zfs/../../../tools/libfsimage/zfs/fsys_zfs.h:74:11: note: expanded from macro 'VERIFY_DN_TYPE' if (type && (dnp)->dn_type != type) { \ ^ 1 error generated. Fix this by not forcing an implicit conversion of the enum into a boolean and instead comparing with the 0 enumerator. Signed-off-by: Roger Pau Monné Acked-by: Wei Liu --- tools/libfsimage/zfs/fsys_zfs.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/libfsimage/zfs/fsys_zfs.h b/tools/libfsimage/zfs/fsys_zfs.h index 5cd627dbac..721972a05a 100644 --- a/tools/libfsimage/zfs/fsys_zfs.h +++ b/tools/libfsimage/zfs/fsys_zfs.h @@ -71,7 +71,7 @@ typedef unsigned int size_t; * Can only be used in functions returning non-0 for failure. */ #define VERIFY_DN_TYPE(dnp, type) \ - if (type && (dnp)->dn_type != type) { \ + if (type != DMU_OT_NONE && (dnp)->dn_type != type) { \ return (ERR_FSYS_CORRUPT); \ } @@ -80,7 +80,7 @@ typedef unsigned int size_t; * Can only be used in functions returning 0 for failure. */ #define VERIFY_OS_TYPE(osp, type) \ - if (type && (osp)->os_type != type) { \ + if (type != DMU_OST_NONE && (osp)->os_type != type) { \ errnum = ERR_FSYS_CORRUPT; \ return (0); \ }