Received: by 2002:a05:6358:a55:b0:ec:fcf4:3ecf with SMTP id 21csp4469911rwb; Sat, 21 Jan 2023 12:38:33 -0800 (PST) X-Google-Smtp-Source: AMrXdXua2p7wseS2uGZDHNo36CG4Td4jsqeX44RzSM2rniTy/j3PtILsu2Scb7RlHQY28/dVscG/ X-Received: by 2002:a17:903:cd:b0:194:721e:611d with SMTP id x13-20020a17090300cd00b00194721e611dmr16140896plc.14.1674333513430; Sat, 21 Jan 2023 12:38:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674333513; cv=none; d=google.com; s=arc-20160816; b=hIL6/tX+GJo0mriIc+XWfsljQyImxeS19QpxnjJnmF/n/9xPJWs5RbDdmQNIzzsdD2 FK5s6Yh94esqwm75SvRFqg+WlQaCuRxvGEtzZLxcm6Ic0Jf0fySh9a6oFFZ/OPJgMRXU //hsRlcwmumEm12s0p+QW6kQ7qrSYi5wAfs+iuXHMeaPp0s9CrW4LXOFfFq6ruCsn9HP Wbx+QTBu1WAjC9tuO9odOzaiRQBZG/6X0AOu0olexLU7/yj3JEJOUCVF2VfENfFpQAsN hHEsHeSgnSuDOMwOi3+OSjC/8exDFPrzS+ZC/qyc4LLUnkT9WQqzPl55R4XIFx6jqG11 XGWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=xOsRZIz4j3uS48yZ7EFARo72LoQKcIqXeja/As9Ye/g=; b=wpOIvCNRbWP1pBn33/EWJkC3aiI8fMWpF2tCb4svB51cz3+BYXpgjeTIm3f42eoNei KCkgsMliFw7Lv9YLcuUVlU0f/ePq+Ehbjs2CgtWV8LndOLxuQTgjDaJSzyqx0KEN0oJ0 aq9LC9vmEPDt3STONHUHeX7xHpJ7jpzd2Hk1KDol3xleRinAIb/+0lgv0gEQfAD1etSQ fIDBQLpj10tsWSZVBEgXxuOPT/BhZ8rKuTtIflY2S0LAaYAROdkDLFX02W1vwg4jR0cr UHvRFFlXx793DziV3eOr5NPfeW8blWB0gJ+lhAPpkQ4nxJ/db24VH93blmn38VSyJnc2 xpDQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=BHs72LE4; spf=pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-ext4-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w15-20020a1709026f0f00b001948bd82a79si20059151plk.480.2023.01.21.12.38.21; Sat, 21 Jan 2023 12:38:33 -0800 (PST) Received-SPF: pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=BHs72LE4; spf=pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-ext4-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230006AbjAUUhQ (ORCPT + 99 others); Sat, 21 Jan 2023 15:37:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52616 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230008AbjAUUgt (ORCPT ); Sat, 21 Jan 2023 15:36:49 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DD80B29400 for ; 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 8873D60B6F for ; Sat, 21 Jan 2023 20:36:45 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 43D36C433A1; 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=SBCJzKRGKr2mo1lvVTXZL+ohtZ1777FKKIEY4Px0uhE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BHs72LE4o1ibFawv7A/FhoCcxlwJ1R3iEZTIsZZdjVUX/ZTTFjIq6W3xNHyqiqmp0 n8WkiOtqi+pNVNpGI20MhmwFIQmTv8g6nvf4K6yM6HUnUZl+wAnFZ0pCCzsHGqAaVq SwLwmWEBS4gGQPEg5c5ynmrMpDw/5+9R9qoT4emukMHfjthqw0SBxOXH/r5kmq6ec2 tOAqpUlQflwkcgqJyoat3iim5Tgy4uuEnTtYNc7LQnL9iJiJmxWLOt8atGpymiQ+o/ VITT1Ztj0uhpoeKWGojEO8gRiRO3XWorx+H9ruQ73+df1ccOhUXNFUKgglY2M1BDlC 1ER8YhRRDI8OA== From: Eric Biggers To: linux-ext4@vger.kernel.org Cc: Jeremy Bongio , Lukas Czerner Subject: [PATCH 34/38] misc/tune2fs: fix setting fsuuid::fsu_len Date: Sat, 21 Jan 2023 12:32:26 -0800 Message-Id: <20230121203230.27624-35-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: X-Mailing-List: linux-ext4@vger.kernel.org From: Eric Biggers Minus does not mean equals. Besides fixing an obvious bug, this avoids the following compiler warning with clang -Wall: tune2fs.c:3625:20: warning: expression result unused [-Wunused-value] fsuuid->fsu_len - UUID_SIZE; ~~~~~~~~~~~~~~~ ^ ~~~~~~~~~ Fixes: a83e199da0ca ("tune2fs: Add support for get/set UUID ioctls.") Reviewed-by: Jeremy Bongio Reviewed-by: Lukas Czerner Signed-off-by: Eric Biggers --- misc/tune2fs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/tune2fs.c b/misc/tune2fs.c index 088f87e53..7937b8b56 100644 --- a/misc/tune2fs.c +++ b/misc/tune2fs.c @@ -3622,7 +3622,7 @@ _("Warning: The journal is dirty. You may wish to replay the journal like:\n\n" ret = -1; #ifdef __linux__ if (fsuuid) { - fsuuid->fsu_len - UUID_SIZE; + fsuuid->fsu_len = UUID_SIZE; fsuuid->fsu_flags = 0; memcpy(&fsuuid->fsu_uuid, new_uuid, UUID_SIZE); ret = ioctl(fd, EXT4_IOC_SETFSUUID, fsuuid); -- 2.39.0