From patchwork Thu Nov 9 07:48:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiapeng Chong X-Patchwork-Id: 163274 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b129:0:b0:403:3b70:6f57 with SMTP id q9csp277593vqs; Wed, 8 Nov 2023 23:48:35 -0800 (PST) X-Google-Smtp-Source: AGHT+IFX15cSg98qZKfhbt79SD5qPLwXapuPmKWeIONarR/GXN58gNah4a6P6F/dYbKeKSFxWZLA X-Received: by 2002:a05:6a00:80f:b0:690:c306:151a with SMTP id m15-20020a056a00080f00b00690c306151amr4498251pfk.0.1699516115290; Wed, 08 Nov 2023 23:48:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699516115; cv=none; d=google.com; s=arc-20160816; b=wE6p3E6LNcI697xMUnaWe/4lh3cOYqJUy33fpiG/UHkR8yQFp1+hvEad/8EnuWgiV1 DM+s0PQMYHTz7PMtLxgk5NDp/otPtgvMnMSnPw+f4Egsksk/bjal96oWNWclUSzQEi6E gtdWpVZxUcUKqtOnp5vDQS4V8F+dE0XuWo+zikhlIngJXIc/8dpH627sLVDw8urbHHnm HfIJW5ATXNNi3hl8ERFoNZaLJvcJSl7pZe+JVO/F22LEGk0vyUO8Pr3gVaK+bF/3JVnC hA+VYVaqxVk7l8OM842q0bOgQpDpfq7OeyFVMDLlgQz8ZDhSxJHdhNDI3f00m3/zgpWT klqQ== 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; bh=h7zT33y9DNO+1UcH3v31rbFo8P8iXvN/kYhjq06Hwlk=; fh=TapvEXZTIZB6cr1I2j4y+MsEQWH4VaZKMFgKGEDdR6A=; b=lcae+c5wFLXSttEb1gnk+xSpIvmJiKthqDR/YaRC9NORC4F/3xwL1kO58SROijKIT0 4AmvI9aRZ5BsMMih+sMQRnTCAH9pgkCW7RtHnKAWbJ/c/2jUBfPGXpw1rUvhFpts+1Bj xvRc1GQwxRuG1wUl3uKRqMzk1aCB6Exdb+i/3HDnFnkym4cqj4tr/Fpv5UVs3oDe1o+l vxnRCYtAPigS3pIFuJa7e/JKr+MyZvylKkRwMedk5VyXTxXSRZQhPfKNLcAvz+rMYx8p fDnd1+lwueOFhni1BYYlrHHBY+oO2TuFUc9L3xHA4FgHedYMTDuwbFnm/PtXqaLawki6 Jxfg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id bg25-20020a056a02011900b005b969c62b27si7839217pgb.747.2023.11.08.23.48.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Nov 2023 23:48:35 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 6B5EB80A7E4E; Wed, 8 Nov 2023 23:48:34 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232832AbjKIHsc (ORCPT + 32 others); Thu, 9 Nov 2023 02:48:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51898 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231336AbjKIHsb (ORCPT ); Thu, 9 Nov 2023 02:48:31 -0500 Received: from out30-113.freemail.mail.aliyun.com (out30-113.freemail.mail.aliyun.com [115.124.30.113]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E84B52693; Wed, 8 Nov 2023 23:48:27 -0800 (PST) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R101e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018045170;MF=jiapeng.chong@linux.alibaba.com;NM=1;PH=DS;RN=6;SR=0;TI=SMTPD_---0Vw.x3PM_1699516096; Received: from localhost(mailfrom:jiapeng.chong@linux.alibaba.com fp:SMTPD_---0Vw.x3PM_1699516096) by smtp.aliyun-inc.com; Thu, 09 Nov 2023 15:48:23 +0800 From: Jiapeng Chong To: kent.overstreet@linux.dev Cc: bfoster@redhat.com, linux-bcachefs@vger.kernel.org, linux-kernel@vger.kernel.org, Jiapeng Chong , Abaci Robot Subject: [PATCH] bcachefs: clean up some inconsistent indenting Date: Thu, 9 Nov 2023 15:48:15 +0800 Message-Id: <20231109074815.117232-1-jiapeng.chong@linux.alibaba.com> X-Mailer: git-send-email 2.20.1.7.g153144c MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Wed, 08 Nov 2023 23:48:34 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782071809850389661 X-GMAIL-MSGID: 1782071809850389661 No functional modification involved. fs/bcachefs/journal_io.c:1832 bch2_journal_write_pick_flush() warn: inconsistent indenting. Reported-by: Abaci Robot Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=7207 Signed-off-by: Jiapeng Chong --- fs/bcachefs/journal_io.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/fs/bcachefs/journal_io.c b/fs/bcachefs/journal_io.c index f4bc2cdbfdd7..72b0f3972170 100644 --- a/fs/bcachefs/journal_io.c +++ b/fs/bcachefs/journal_io.c @@ -1823,16 +1823,13 @@ static int bch2_journal_write_pick_flush(struct journal *j, struct journal_buf * if (error && test_bit(JOURNAL_NEED_FLUSH_WRITE, &j->flags)) return -EIO; - if (error || - w->noflush || - (!w->must_flush && - (jiffies - j->last_flush_write) < msecs_to_jiffies(c->opts.journal_flush_delay) && - test_bit(JOURNAL_MAY_SKIP_FLUSH, &j->flags))) { - w->noflush = true; + if (error || w->noflush || (!w->must_flush && + (jiffies - j->last_flush_write) < msecs_to_jiffies(c->opts.journal_flush_delay) && + test_bit(JOURNAL_MAY_SKIP_FLUSH, &j->flags))) { + w->noflush = true; SET_JSET_NO_FLUSH(w->data, true); w->data->last_seq = 0; w->last_seq = 0; - j->nr_noflush_writes++; } else { j->last_flush_write = jiffies;