From nobody Thu Dec 18 21:06:53 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 07203C7EE23 for ; Tue, 2 May 2023 14:52:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234486AbjEBOwi (ORCPT ); Tue, 2 May 2023 10:52:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51194 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234456AbjEBOwe (ORCPT ); Tue, 2 May 2023 10:52:34 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A2EB71BD8 for ; Tue, 2 May 2023 07:51:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1683039093; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=rlI4i5NkJUU4v3/TaCr79bgC9FfiCXPR9/G1iFN8MDM=; b=e7wJfl3u7dvVlqBn98sebqIvPAuP84wG9PpOrJWJt9Bd9dWbpabKSyLsdwMm5DmbE7AFwb EkB0KJG3mvmhxyJ/PCIn26GyXx/+PQq3rRRG723zp3Jm61oirRYMG2rK7gaJ8PHKOe/bdF kjBjnZnSjsdlGWumwZU7kczrQG/cZ0E= Received: from mail-qv1-f69.google.com (mail-qv1-f69.google.com [209.85.219.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-313-6CnRVIbVOGmUfGAL4yfkSQ-1; Tue, 02 May 2023 10:51:32 -0400 X-MC-Unique: 6CnRVIbVOGmUfGAL4yfkSQ-1 Received: by mail-qv1-f69.google.com with SMTP id 6a1803df08f44-61b60166509so8779416d6.1 for ; Tue, 02 May 2023 07:51:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683039092; x=1685631092; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=rlI4i5NkJUU4v3/TaCr79bgC9FfiCXPR9/G1iFN8MDM=; b=hn0nbSBW1fXHWM5PqsaoxptHyOnFUxWBfILNDABCX35lSRbqFTLeZm1N9pojFSB+86 AEi+N6n9n5Od7P74MwVWIPLMBAjOpX5vbCLuMX8Mz+bCyk6mv9YfSOKrypuxs0LelvFu fmQC/zVgx+EzqOY0uYR1F8AGK+aCcrvPWtl6xdtVMFOzTdNJ71aJx/EWRlAL8SDT+zBp aqwJt9L4hVz+hV0E5LKJDCQws483QaI0hoJNR/ZLTTT35BZQzpQaK9PLVhFt1bg7SS4p J90az8Dmh/gwd5ISkrWjqU6ZmuKupblC1NB7QbGj6579cAcGJLnq5P6rPS7RH+nNyb+g SHkQ== X-Gm-Message-State: AC+VfDzqv8OhQhSmKlMzgyyv61pyno7eeUwHdP1jb8uezsYy7/NpqQKr ZPpjzH9HmCjk0lVbq7l6gZcqvON+QCZ5eNjOwmTXOZhBIkODShHU/YgpEwl9kthH8BOfnyp4NwO SnyH09ItnugCDhpj4OvxlHrTK X-Received: by 2002:a05:6214:1305:b0:5ab:28aa:2429 with SMTP id pn5-20020a056214130500b005ab28aa2429mr6745870qvb.30.1683039092282; Tue, 02 May 2023 07:51:32 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6dDegzBLcQBdCcxYpqd+dYi2UlOninPF6u15FNk6D4g/uiioJP24FRBYakE8yyzmhtVJMY5w== X-Received: by 2002:a05:6214:1305:b0:5ab:28aa:2429 with SMTP id pn5-20020a056214130500b005ab28aa2429mr6745835qvb.30.1683039092025; Tue, 02 May 2023 07:51:32 -0700 (PDT) Received: from dell-per740-01.7a2m.lab.eng.bos.redhat.com (nat-pool-bos-t.redhat.com. [66.187.233.206]) by smtp.gmail.com with ESMTPSA id j13-20020a0cf50d000000b005dd8b9345besm9613655qvm.86.2023.05.02.07.51.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 May 2023 07:51:31 -0700 (PDT) From: Tom Rix To: clm@fb.com, josef@toxicpanda.com, dsterba@suse.com Cc: linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org, Tom Rix Subject: [PATCH] btrfs: replace else-statement with initialization Date: Tue, 2 May 2023 10:51:29 -0400 Message-Id: <20230502145129.2927253-1-trix@redhat.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" A small optimization Move the default value of transid to its initialization and remove the else-statement. Signed-off-by: Tom Rix --- fs/btrfs/ioctl.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index 25833b4eeaf5..4694301aa91e 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -3132,14 +3132,13 @@ static noinline long btrfs_ioctl_start_sync(struct = btrfs_root *root, static noinline long btrfs_ioctl_wait_sync(struct btrfs_fs_info *fs_info, void __user *argp) { - u64 transid; + u64 transid =3D 0; /* current trans */ =20 if (argp) { if (copy_from_user(&transid, argp, sizeof(transid))) return -EFAULT; - } else { - transid =3D 0; /* current trans */ } + return btrfs_wait_for_commit(fs_info, transid); } =20 --=20 2.27.0