Message ID | 20230121203230.27624-34-ebiggers@kernel.org |
---|---|
State | Accepted |
Headers | show
Return-Path: <SRS0=gbeP=5S=vger.kernel.org=linux-ext4-owner@ozlabs.org> 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=gbep=5s=vger.kernel.org=linux-ext4-owner@ozlabs.org; receiver=<UNKNOWN>) 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=aZOCkfwB; 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 4Nzp7z3dHfz23gY for <incoming@patchwork.ozlabs.org>; Sun, 22 Jan 2023 07:37:19 +1100 (AEDT) Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by gandalf.ozlabs.org (Postfix) with ESMTP id 4Nzp7z39twz4xN1 for <incoming@patchwork.ozlabs.org>; Sun, 22 Jan 2023 07:37:19 +1100 (AEDT) Received: by gandalf.ozlabs.org (Postfix) id 4Nzp7z37Fnz4y03; Sun, 22 Jan 2023 07:37:19 +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=<UNKNOWN>) 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=aZOCkfwB; 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 4Nzp7z32zYz4xN1 for <patchwork-incoming@ozlabs.org>; Sun, 22 Jan 2023 07:37:19 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230086AbjAUUhS (ORCPT <rfc822;patchwork-incoming@ozlabs.org>); Sat, 21 Jan 2023 15:37:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52620 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230011AbjAUUgt (ORCPT <rfc822;linux-ext4@vger.kernel.org>); Sat, 21 Jan 2023 15:36:49 -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 DD9D829403 for <linux-ext4@vger.kernel.org>; Sat, 21 Jan 2023 12:36:45 -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 B218760B07 for <linux-ext4@vger.kernel.org>; Sat, 21 Jan 2023 20:36:45 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 129D5C433EF for <linux-ext4@vger.kernel.org>; Sat, 21 Jan 2023 20:36:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1674333405; bh=BHlFdsm+U4LzKUPj9OwfoZOYeQ7WU/+UY8dOM0bSebE=; h=From:To:Subject:Date:In-Reply-To:References:From; b=aZOCkfwBZxehZlEDlb0iP79onRFrHkhJO8rA+SSkNh+8e2UbKGRSg5oiD83Sd/3Zs XYDnQBRNBk34f6icbcWNOr9vPD2QGvBWANZqtjILTFPokkE2X9ABZ1al5eGOYp0Xvi EajX28hjAqSHPBCBrxmrDJD52aanPO/mEyh+r7iuGIGYTuNUph6qr/yoEsqdNiuDsH 0HXmywRF04JUzfLMQM4LaKGAvFdAe23+8332s/kvrEs0zHZPd6p3Pp5j1O/gMfLrJR 5oJyo49sArVBZa8S5Quthosz27TyH2pUMaAjc96Dhr+SjzJAqGQMMO4b5jcECdxgfo X5BLtQE/Go0MQ== From: Eric Biggers <ebiggers@kernel.org> To: linux-ext4@vger.kernel.org Subject: [PATCH 33/38] misc/mke2fs: fix a -Wunused-variable warning in PRS() Date: Sat, 21 Jan 2023 12:32:25 -0800 Message-Id: <20230121203230.27624-34-ebiggers@kernel.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230121203230.27624-1-ebiggers@kernel.org> References: <20230121203230.27624-1-ebiggers@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: <linux-ext4.vger.kernel.org> X-Mailing-List: linux-ext4@vger.kernel.org |
Series |
e2fsprogs: misc fixes, and add a GitHub Actions file
|
expand
|
diff --git a/misc/mke2fs.c b/misc/mke2fs.c index 24cc14750..7028d3935 100644 --- a/misc/mke2fs.c +++ b/misc/mke2fs.c @@ -1598,7 +1598,6 @@ static void PRS(int argc, char *argv[]) * Finally, we complain about fs_blocks_count > 2^32 on a non-64bit fs. */ blk64_t fs_blocks_count = 0; - long sysval; int s_opt = -1, r_opt = -1; char *fs_features = 0; int fs_features_size = 0; @@ -1632,9 +1631,12 @@ static void PRS(int argc, char *argv[]) #define _SC_PAGESIZE _SC_PAGE_SIZE #endif #ifdef _SC_PAGESIZE - sysval = sysconf(_SC_PAGESIZE); - if (sysval > 0) - sys_page_size = sysval; + { + long sysval = sysconf(_SC_PAGESIZE); + + if (sysval > 0) + sys_page_size = sysval; + } #endif /* _SC_PAGESIZE */ #endif /* HAVE_SYSCONF */