Received: by 2002:a05:6358:9144:b0:117:f937:c515 with SMTP id r4csp6973206rwr; Tue, 2 May 2023 07:55:57 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4p4aEKg8V77P9wUQRVQn2zPiH6BA0Yme1gQK36eKr0r9FeCcJUMwXCFfkJhMStxuevyE4h X-Received: by 2002:a05:6a00:15cf:b0:63b:62d1:d868 with SMTP id o15-20020a056a0015cf00b0063b62d1d868mr24891100pfu.8.1683039357010; Tue, 02 May 2023 07:55:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683039356; cv=none; d=google.com; s=arc-20160816; b=F0V2LJIDVR6LxO9c8Tw1OnG0WSThwvoRLkvVVu3QPokcQYIKXj1sNfei/wKOyOmlfi zoTT+uGRnp3vBP48GF4xdQFRVdRUy0DAIjzhdyTRsk3wqBBvDUdqvbkddTSLorn67S/u kyY9pu7k1DQAiUzXn8sKYOc5t2J34crFv5laTH5bxB8mPpDHpj4WkZn+U6HQ4hyxBp8E EF/ojdycReKGXb+kRGEuyMls3blee8CBQrlIJnJ67PCNM3S6D7LDCHY1RBLpllmbpGD6 1rA2skS8u8hib/W4sOKj4L0P3YHrEh/1CZDjM2nnMxm4TWcCaukvgIgpcESBo2uKC6v1 iC2Q== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=rlI4i5NkJUU4v3/TaCr79bgC9FfiCXPR9/G1iFN8MDM=; b=m7Zn/ndX1opQhhI1j8vvsWjysmReaj47G1EcBL4JCOAx48cYLvloY9SDiQOXThqujW KD2BfhZgC1ORaWf8llEycxp9w07x9x/Rymy9JKAiVKX6u+3XwieYuUO0EJDy7VI5Xh/O 3ET5TS5J8jUs5srdei172SqXKfMN5GhGCI8vB+RcTisJVD4JG/dMsxkX/JTSknhkbJ93 Gq4p/9iUTtLqN+U1A6C/d7TBzG/eavbM2aUJ1Y14Fl0XaH5VYP9fSqkB8ApI7uy+jMoI /dlFq+E3vilCnOwt7E+ngQStnb168p5CHOGuJGiL8JRn+I+N1UN0WraLROccDFV3USnD HpwQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=e7wJfl3u; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 4-20020a620604000000b0063b72bd28absi17425267pfg.135.2023.05.02.07.55.45; Tue, 02 May 2023 07:55:56 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-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=@redhat.com header.s=mimecast20190719 header.b=e7wJfl3u; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234484AbjEBOwh (ORCPT + 99 others); Tue, 2 May 2023 10:52:37 -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-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: 8bit X-Spam-Status: No, score=-2.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE 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-kernel@vger.kernel.org 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 = 0; /* current trans */ if (argp) { if (copy_from_user(&transid, argp, sizeof(transid))) return -EFAULT; - } else { - transid = 0; /* current trans */ } + return btrfs_wait_for_commit(fs_info, transid); } -- 2.27.0