From patchwork Sat Jan 28 22:46:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 1733381 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=ozlabs.org (client-ip=150.107.74.76; helo=gandalf.ozlabs.org; envelope-from=srs0=rmxa=5z=vger.kernel.org=linux-ext4-owner@ozlabs.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=JDMJeObo; dkim-atps=neutral Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P48y45sdpz23j5 for ; Sun, 29 Jan 2023 09:58:52 +1100 (AEDT) Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by gandalf.ozlabs.org (Postfix) with ESMTP id 4P48y04LDsz4xG5 for ; Sun, 29 Jan 2023 09:58:48 +1100 (AEDT) Received: by gandalf.ozlabs.org (Postfix) id 4P48y04Hzcz4xGM; Sun, 29 Jan 2023 09:58:48 +1100 (AEDT) Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: gandalf.ozlabs.org; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: gandalf.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2620:137:e000::1:20; helo=out1.vger.email; envelope-from=linux-ext4-owner@vger.kernel.org; receiver=) Authentication-Results: gandalf.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=JDMJeObo; dkim-atps=neutral Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by gandalf.ozlabs.org (Postfix) with ESMTP id 4P48y04DH1z4xG5 for ; Sun, 29 Jan 2023 09:58:48 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231797AbjA1W6q (ORCPT ); Sat, 28 Jan 2023 17:58:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54338 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230325AbjA1W6n (ORCPT ); Sat, 28 Jan 2023 17:58:43 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9B17122A03 for ; Sat, 28 Jan 2023 14:58:42 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 1DAE160C26 for ; Sat, 28 Jan 2023 22:58:42 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7302BC433EF for ; Sat, 28 Jan 2023 22:58:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1674946721; bh=2X8lgeo655rQ+0A49CCi05+HuhTOsBXlqkgk7n9JcpY=; h=From:To:Subject:Date:In-Reply-To:References:From; b=JDMJeOboAL77rzch9nxHNSoiX1nQwLcSzwyTatX12NuTZXr0x/A6iv5JeAv9lnTjx QhRrtSfzqxWC2Up+3We4aMQMtTY5giZn/cwnKkPeCuiGqR1x3jyHx5qcQEQmePXJOh RD4PGlc4Y1p2wlR/8ATnFURe3pglwaef1BEeFsNyrminAw65mhTiN0Yu7bfblMos5w fV5iEi345vM87016MzHHBQTiKHjArY/E0TEZm1AVJo4PsHCUPHQG/eUZYGJ4UoZ449 Iv2GPoUTO0z4vtrqLs8QPrysiXA/5o3Eb1bDGPdtohOaNr8L7u9sHk7Rt+cy4YGKGG 8v3/rE0zhbDXA== From: Eric Biggers To: linux-ext4@vger.kernel.org Subject: [PATCH 1/4] ci.yml: ensure -Werror really gets used in all cases Date: Sat, 28 Jan 2023 14:46:48 -0800 Message-Id: <20230128224651.59593-2-ebiggers@kernel.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230128224651.59593-1-ebiggers@kernel.org> References: <20230128224651.59593-1-ebiggers@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org From: Eric Biggers -Werror wasn't actually being used when building the libraries, as the libraries use CFLAGS_STLIB instead of CFLAGS. Use CFLAGS_WARN, which gets included in both. Note: -Werror can't just be passed to 'configure' like the other flags are, as it interferes with some of the configure checks. Signed-off-by: Eric Biggers --- .github/workflows/ci.yml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) base-commit: 0352d353adbe6c5d6f1937e12c66e599b8657d72 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 29482178d..97b15bfbb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,7 +10,7 @@ jobs: steps: - uses: actions/checkout@v2 - run: ./configure CC=gcc CFLAGS="$DEF_CFLAGS" - - run: make -j8 check V=1 CFLAGS="$DEF_CFLAGS -Werror" + - run: make -j8 check V=1 CFLAGS_WARN="-Werror" - run: make -j8 install V=1 DESTDIR=$PWD/installdir - run: make -j8 uninstall V=1 DESTDIR=$PWD/installdir @@ -24,7 +24,7 @@ jobs: sudo apt-get update sudo apt-get install -y clang - run: ./configure CC=clang CFLAGS="$DEF_CFLAGS" - - run: make -j8 check V=1 CFLAGS="$DEF_CFLAGS -Werror" + - run: make -j8 check V=1 CFLAGS_WARN="-Werror" - run: make -j8 install V=1 DESTDIR=$PWD/installdir - run: make -j8 uninstall V=1 DESTDIR=$PWD/installdir @@ -38,7 +38,7 @@ jobs: sudo apt-get update sudo apt-get install -y gcc-multilib - run: ./configure CC=gcc CFLAGS="$DEF_CFLAGS -m32" LDFLAGS="-m32" - - run: make -j8 check V=1 CFLAGS="$DEF_CFLAGS -m32 -Werror" + - run: make -j8 check V=1 CFLAGS_WARN="-Werror" - run: make -j8 install V=1 DESTDIR=$PWD/installdir - run: make -j8 uninstall V=1 DESTDIR=$PWD/installdir @@ -53,7 +53,7 @@ jobs: sudo apt-get install -y clang - run: echo "ASAN_CFLAGS=$DEF_CFLAGS -fsanitize=address -fno-sanitize-recover=address" >> $GITHUB_ENV - run: ./configure CC=clang CFLAGS="$ASAN_CFLAGS" LDFLAGS="$ASAN_CFLAGS" - - run: make -j8 check V=1 CFLAGS="$ASAN_CFLAGS -Werror" + - run: make -j8 check V=1 CFLAGS_WARN="-Werror" ubsan-build-and-test: name: Build and test with UBSAN enabled @@ -66,7 +66,7 @@ jobs: sudo apt-get install -y clang - run: echo "UBSAN_CFLAGS=$DEF_CFLAGS -fsanitize=undefined -fno-sanitize-recover=undefined" >> $GITHUB_ENV - run: ./configure CC=clang CFLAGS="$UBSAN_CFLAGS" LDFLAGS="$UBSAN_CFLAGS" - - run: make -j8 check V=1 CFLAGS="$UBSAN_CFLAGS -Werror" + - run: make -j8 check V=1 CFLAGS_WARN="-Werror" macos-build-and-test: name: Build and test on macOS @@ -76,7 +76,7 @@ jobs: - run: ./configure CFLAGS="$DEF_CFLAGS" # -Wno-error=deprecated-declarations is needed to suppress known warnings # due to e2fsprogs' use of sbrk(0) and daemon(). - - run: make -j8 check V=1 CFLAGS="$DEF_CFLAGS -Werror -Wno-error=deprecated-declarations" + - run: make -j8 check V=1 CFLAGS_WARN="-Werror -Wno-error=deprecated-declarations" - run: make -j8 install DESTDIR=$PWD/installdir - run: make -j8 uninstall DESTDIR=$PWD/installdir @@ -104,13 +104,13 @@ jobs: # dependencies: all libraries except libss. The build system doesn't want # to build just those parts, though, so do it one step at a time... - run: ./configure CFLAGS="$DEF_CFLAGS" - - run: make -j8 subs V=1 CFLAGS="$DEF_CFLAGS -Werror" - - run: make -j8 -C lib/et/ all V=1 CFLAGS="$DEF_CFLAGS -Werror" - - run: make -j8 -C lib/uuid/ all V=1 CFLAGS="$DEF_CFLAGS -Werror" - - run: make -j8 -C lib/blkid/ all V=1 CFLAGS="$DEF_CFLAGS -Werror" - - run: make -j8 -C lib/ext2fs/ all V=1 CFLAGS="$DEF_CFLAGS -Werror" - - run: make -j8 -C lib/support/ all V=1 CFLAGS="$DEF_CFLAGS -Werror" - - run: make -j8 -C lib/e2p/ all V=1 CFLAGS="$DEF_CFLAGS -Werror" - - run: make -j8 -C misc/ mke2fs V=1 CFLAGS="$DEF_CFLAGS -Werror" + - run: make -j8 subs V=1 CFLAGS_WARN="-Werror" + - run: make -j8 -C lib/et/ all V=1 CFLAGS_WARN="-Werror" + - run: make -j8 -C lib/uuid/ all V=1 CFLAGS_WARN="-Werror" + - run: make -j8 -C lib/blkid/ all V=1 CFLAGS_WARN="-Werror" + - run: make -j8 -C lib/ext2fs/ all V=1 CFLAGS_WARN="-Werror" + - run: make -j8 -C lib/support/ all V=1 CFLAGS_WARN="-Werror" + - run: make -j8 -C lib/e2p/ all V=1 CFLAGS_WARN="-Werror" + - run: make -j8 -C misc/ mke2fs V=1 CFLAGS_WARN="-Werror" - run: touch image.ext4 - run: misc/mke2fs.exe -T ext4 image.ext4 128M From patchwork Sat Jan 28 22:46:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 1733382 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=ozlabs.org (client-ip=2404:9400:2221:ea00::3; helo=gandalf.ozlabs.org; envelope-from=srs0=rmxa=5z=vger.kernel.org=linux-ext4-owner@ozlabs.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=t8N2UgSx; dkim-atps=neutral Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P48y46FBqz23j6 for ; Sun, 29 Jan 2023 09:58:52 +1100 (AEDT) Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by gandalf.ozlabs.org (Postfix) with ESMTP id 4P48y45l5wz4x2c for ; Sun, 29 Jan 2023 09:58:52 +1100 (AEDT) Received: by gandalf.ozlabs.org (Postfix) id 4P48y45hpPz4xGM; Sun, 29 Jan 2023 09:58:52 +1100 (AEDT) Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: gandalf.ozlabs.org; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: gandalf.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2620:137:e000::1:20; helo=out1.vger.email; envelope-from=linux-ext4-owner@vger.kernel.org; receiver=) Authentication-Results: gandalf.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=t8N2UgSx; dkim-atps=neutral Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by gandalf.ozlabs.org (Postfix) with ESMTP id 4P48y45dH2z4x2c for ; Sun, 29 Jan 2023 09:58:52 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231888AbjA1W6u (ORCPT ); Sat, 28 Jan 2023 17:58:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54356 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231495AbjA1W6p (ORCPT ); Sat, 28 Jan 2023 17:58:45 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7911E2386F for ; Sat, 28 Jan 2023 14:58:44 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 35F44B80B8F for ; Sat, 28 Jan 2023 22:58:43 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A2557C4339B for ; Sat, 28 Jan 2023 22:58:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1674946721; bh=lUK/hRgoHyT21Z5owuFxULqAhlQAm54k6aJI34U/HSA=; h=From:To:Subject:Date:In-Reply-To:References:From; b=t8N2UgSxlfz/fsOKJx3SfeEBYL46WCqKv3dnrzbrSHGb+60QLrEy6QQnghBj5JcLT QTfQBPkNGM5Xhlkt9ieEMTvGmUqoQmvk9oaqPWa0bitYwRq+aIVD/z2BkUaoQcWEEO pRRih+u+k8MpmmZRuBAcMvemW3e3aAxM65fwAipAZt5sXX610aOATALx3jx6YHX3Jx aXZE0QvURWd+fVjmGR5IWi84fUXjWyoE1XtlG1c+ztNkfkdi5uzYn6ahL2Wr3wEFbd VEkWDuuwkoUHFAu9QSd1LvC6B4GG+acgnbR0dLnua6EOvtZj1qjI5XMimlGYWzBKfY +/1LrCwlRHqrg== From: Eric Biggers To: linux-ext4@vger.kernel.org Subject: [PATCH 2/4] debugfs: fix a -Wformat warning in dump_journal() Date: Sat, 28 Jan 2023 14:46:49 -0800 Message-Id: <20230128224651.59593-3-ebiggers@kernel.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230128224651.59593-1-ebiggers@kernel.org> References: <20230128224651.59593-1-ebiggers@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org From: Eric Biggers This really should just use PRIi64, but e2fsprogs doesn't use the inttypes.h format specifiers elsewhere, so just be consistent for now. Signed-off-by: Eric Biggers --- debugfs/logdump.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debugfs/logdump.c b/debugfs/logdump.c index 036b50baf..938b48907 100644 --- a/debugfs/logdump.c +++ b/debugfs/logdump.c @@ -479,7 +479,8 @@ static void dump_journal(char *cmdname, FILE *out_file, if ((blocknr == first_transaction_blocknr) && (cur_counts != 0) && dump_old && (dump_counts != -1)) { - fprintf(out_file, "Dump all %lld journal records.\n", cur_counts); + fprintf(out_file, "Dump all %lld journal records.\n", + (long long)cur_counts); break; } From patchwork Sat Jan 28 22:46:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 1733383 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=ozlabs.org (client-ip=150.107.74.76; helo=gandalf.ozlabs.org; envelope-from=srs0=rmxa=5z=vger.kernel.org=linux-ext4-owner@ozlabs.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=SqxTsfp5; dkim-atps=neutral Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P48y75n1cz1yhq for ; Sun, 29 Jan 2023 09:58:55 +1100 (AEDT) Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by gandalf.ozlabs.org (Postfix) with ESMTP id 4P48y75KQGz4x2c for ; Sun, 29 Jan 2023 09:58:55 +1100 (AEDT) Received: by gandalf.ozlabs.org (Postfix) id 4P48y75HF6z4xG5; Sun, 29 Jan 2023 09:58:55 +1100 (AEDT) Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: gandalf.ozlabs.org; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: gandalf.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2620:137:e000::1:20; helo=out1.vger.email; envelope-from=linux-ext4-owner@vger.kernel.org; receiver=) Authentication-Results: gandalf.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=SqxTsfp5; dkim-atps=neutral Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by gandalf.ozlabs.org (Postfix) with ESMTP id 4P48y75B7Wz4x2c for ; Sun, 29 Jan 2023 09:58:55 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231495AbjA1W6w (ORCPT ); Sat, 28 Jan 2023 17:58:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54358 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230012AbjA1W6p (ORCPT ); Sat, 28 Jan 2023 17:58:45 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E55E722A03 for ; Sat, 28 Jan 2023 14:58:44 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 3D1EBB80BFB for ; Sat, 28 Jan 2023 22:58:43 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D1D3CC4339C for ; Sat, 28 Jan 2023 22:58:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1674946721; bh=FeajjHnE52Ix7Xgb2KZ7po/g/JisLPCMtZp+5RbWrGA=; h=From:To:Subject:Date:In-Reply-To:References:From; b=SqxTsfp5mAQUSuozHQSd6M4Bx42SAkprv4t7vFuShPpsQ6qQuhLfkgmo/I71pFJqT uKlcz6cYnvJl06lvZs5HhfD6bdF53jCawU8Z9ZzeEm5l/TRxk89y1RGN0xleDdt5LX 9KJAe7myrEpvR1NSQtObHRML+xwyQFhAt8w+xZ7nCN8ihgEqGhcAdFxrfCE1Y0CAwY Sfipmwo6ogGP2wIDNUsSt7rFGYGa3ulFDp0vJ5iXMuG+rihsEm/QtGmuh+yiNvwzMs Lv16QLB4ujZEijASkijZT4UZzUpXNu0Wjt7UgP3gQXtLEl7b8DHIjaA2J/RAnsNy+8 ykvtDBV4Dg8Cw== From: Eric Biggers To: linux-ext4@vger.kernel.org Subject: [PATCH 3/4] lib/ext2fs: don't warn about lack of getmntent on Windows Date: Sat, 28 Jan 2023 14:46:50 -0800 Message-Id: <20230128224651.59593-4-ebiggers@kernel.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230128224651.59593-1-ebiggers@kernel.org> References: <20230128224651.59593-1-ebiggers@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org From: Eric Biggers It is expected that Windows doesn't have getmntent(), so don't warn about it. Signed-off-by: Eric Biggers --- lib/ext2fs/Android.bp | 1 - lib/ext2fs/ismounted.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/ext2fs/Android.bp b/lib/ext2fs/Android.bp index eb4482d79..f5cbeec9f 100644 --- a/lib/ext2fs/Android.bp +++ b/lib/ext2fs/Android.bp @@ -121,7 +121,6 @@ cc_library { enabled: true, include_dirs: ["external/e2fsprogs/include/mingw"], cflags: [ - "-Wno-error=cpp", "-Wno-format", "-Wno-unused-variable", "-Wno-error=typedef-redefinition", diff --git a/lib/ext2fs/ismounted.c b/lib/ext2fs/ismounted.c index 22bc8352b..a7db1a5c4 100644 --- a/lib/ext2fs/ismounted.c +++ b/lib/ext2fs/ismounted.c @@ -414,7 +414,7 @@ errcode_t ext2fs_check_mount_point(const char *device, int *mount_flags, #ifdef HAVE_GETMNTINFO retval = check_getmntinfo(device, mount_flags, mtpt, mtlen); #else -#ifdef __GNUC__ +#if defined(__GNUC__) && !defined(_WIN32) #warning "Can't use getmntent or getmntinfo to check for mounted filesystems!" #endif *mount_flags = 0; From patchwork Sat Jan 28 22:46:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 1733379 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=ozlabs.org (client-ip=2404:9400:2221:ea00::3; helo=gandalf.ozlabs.org; envelope-from=srs0=rmxa=5z=vger.kernel.org=linux-ext4-owner@ozlabs.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=hB9IjBs1; dkim-atps=neutral Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P48y44pQfz1yhq for ; Sun, 29 Jan 2023 09:58:52 +1100 (AEDT) Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by gandalf.ozlabs.org (Postfix) with ESMTP id 4P48y02V6jz4x2c for ; Sun, 29 Jan 2023 09:58:48 +1100 (AEDT) Received: by gandalf.ozlabs.org (Postfix) id 4P48y02RpQz4xG5; Sun, 29 Jan 2023 09:58:48 +1100 (AEDT) Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: gandalf.ozlabs.org; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: gandalf.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2620:137:e000::1:20; helo=out1.vger.email; envelope-from=linux-ext4-owner@vger.kernel.org; receiver=) Authentication-Results: gandalf.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=hB9IjBs1; dkim-atps=neutral Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by gandalf.ozlabs.org (Postfix) with ESMTP id 4P48y01DHfz4x2c for ; Sun, 29 Jan 2023 09:58:48 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231567AbjA1W6p (ORCPT ); Sat, 28 Jan 2023 17:58:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54340 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230012AbjA1W6n (ORCPT ); Sat, 28 Jan 2023 17:58:43 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 13A4E233E0 for ; Sat, 28 Jan 2023 14:58:43 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id ACBDC60C53 for ; Sat, 28 Jan 2023 22:58:42 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0D2A1C4339E for ; Sat, 28 Jan 2023 22:58:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1674946722; bh=S9EG6xTRy0n5rDDtlmHE3JRNqxIsKAYfyqOTfxAeQjM=; h=From:To:Subject:Date:In-Reply-To:References:From; b=hB9IjBs1RoQ7jzTklojbEJqQSjf1TVFx3N48qxGuJxDnj6zwPEQle/k7CNJmT5nP1 26FQZBSdIbNlpQjKHSMAAWAs911iRMQCfOuWp/+13FPq67r+2JVXr2ppL8wpWIufWe pdUvC3RAroWZebxbvvlArd5EtUtGUG4KLLJfcZc9lfAqWfIpx7STItZDnmZRNFeF5B m84fntQXjeUG94n+OfeIbmqEuHGb2i15aIyP2F3JKmmKucylMtZLoAAueLAS9IjW/D yK8+OKXaIxGE34hFt+kBloY5y9yWdkwB6fisCO32SqccKOgTGW1ZT0wWpUKgav2D+U IU08VqntRUIAA== From: Eric Biggers To: linux-ext4@vger.kernel.org Subject: [PATCH 4/4] lib/uuid: remove unneeded Windows UUID workaround Date: Sat, 28 Jan 2023 14:46:51 -0800 Message-Id: <20230128224651.59593-5-ebiggers@kernel.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230128224651.59593-1-ebiggers@kernel.org> References: <20230128224651.59593-1-ebiggers@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org From: Eric Biggers Some .c files in lib/uuid/ contain the following: #ifdef _WIN32 #define _WIN32_WINNT 0x0500 #include #define UUID MYUUID #endif This seems to have been intended to allow the use of a local "UUID" type without colliding with "UUID" in the Windows API. However, this is unnecessary because there's no local "UUID" type -- there's only uuid_t. None of these .c files need the include of windows.h, either. Finally, the unconditional definition of _WIN32_WINNT causes a compiler warning when the user defines _WIN32_WINNT themself. Since this code is unnecessary and is causing problems, just remove it. Signed-off-by: Eric Biggers --- lib/uuid/Android.bp | 2 -- lib/uuid/gen_uuid.c | 5 ----- lib/uuid/tst_uuid.c | 6 ------ lib/uuid/uuid_time.c | 6 ------ 4 files changed, 19 deletions(-) diff --git a/lib/uuid/Android.bp b/lib/uuid/Android.bp index 67968dba3..daf30bb94 100644 --- a/lib/uuid/Android.bp +++ b/lib/uuid/Android.bp @@ -45,8 +45,6 @@ cc_library { ], target: { windows: { - // Cannot suppress the _WIN32_WINNT redefined warning. - cflags: ["-Wno-error"], include_dirs: [ "external/e2fsprogs/include/mingw" ], enabled: true }, diff --git a/lib/uuid/gen_uuid.c b/lib/uuid/gen_uuid.c index a2225ccee..2f028867a 100644 --- a/lib/uuid/gen_uuid.c +++ b/lib/uuid/gen_uuid.c @@ -41,11 +41,6 @@ #include "config.h" -#ifdef _WIN32 -#define _WIN32_WINNT 0x0500 -#include -#define UUID MYUUID -#endif #include #ifdef HAVE_UNISTD_H #include diff --git a/lib/uuid/tst_uuid.c b/lib/uuid/tst_uuid.c index 649bfbc05..c1c290158 100644 --- a/lib/uuid/tst_uuid.c +++ b/lib/uuid/tst_uuid.c @@ -34,12 +34,6 @@ #include "config.h" -#ifdef _WIN32 -#define _WIN32_WINNT 0x0500 -#include -#define UUID MYUUID -#endif - #include #include diff --git a/lib/uuid/uuid_time.c b/lib/uuid/uuid_time.c index af837a2ca..b519d3c4b 100644 --- a/lib/uuid/uuid_time.c +++ b/lib/uuid/uuid_time.c @@ -36,12 +36,6 @@ #include "config.h" -#ifdef _WIN32 -#define _WIN32_WINNT 0x0500 -#include -#define UUID MYUUID -#endif - #include #ifdef HAVE_UNISTD_H #include