From patchwork Fri Jun 30 11:08:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baokun Li X-Patchwork-Id: 114679 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp10276430vqr; Fri, 30 Jun 2023 04:15:39 -0700 (PDT) X-Google-Smtp-Source: APBJJlFx4LIxIl1viNwRxreu4a1LeD6SmAs+MXGL0FdXmSRkmFDSHK9SOZTicU08hJC1ouabQUNQ X-Received: by 2002:a17:902:e80b:b0:1b7:dfbd:4df0 with SMTP id u11-20020a170902e80b00b001b7dfbd4df0mr1560663plg.45.1688123739259; Fri, 30 Jun 2023 04:15:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688123739; cv=none; d=google.com; s=arc-20160816; b=eXH7PRRyipjBzHt0ks4vnvVj0j1G8LVAwnJlyGIP67WYloFycqODLFBnNPOHB3JTF/ edUPoauIiWdALRu9aSdL7BC3CL27WPNagt40iBpY5QFjsuEuAToJOAFwHYJ5oUierrGa 1hEqnusbvdWA2pOAuhaqJrvwPItGinMkBckQgwrLiiJ1RF44XpyBeHoOkVQsZxvdIBvA yjzJVPKmL9IIVlvTMbYiv1Q8H7F19jeKCSHiihabf+sT1qzJEW3eSPVv34QdiJCjG28r 5rQmBYu29L+/SUfbfm1rEivx+OtSjSHxRwuzxyaJ/w0IPPVJtfIojz5YDIMkpEhj/FEr wuSQ== 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; bh=NiLvcPYr5rj1pPYUeYq5N4/y66efAYaos4OkfirGZYs=; fh=fHzCyx2lgDg5rzxkd+fn4L1zIOfYfCj3lN8BN24cVWY=; b=zNWNb3BCIwucQThsBwCYWh0PR9JZFgvEGtlqCIf0QVo0NqShToZOfHoBezq657fWqo PVcKjbkFpCAA4jSLhfXPfK7ROZO+V8hNAlrKw8y1rBndyUsYKEzz6eyC8HAaVOrdGEES z6r0ahgQ+zZMwUlmzZx/N0CAVv+moGNrpa2FtA/OlY5eGXBZayl/9nvAbN+smSl/vCam fViCDF83cpYX/tCe7ntUuKh4/VGFqfsCbw2V1BFEW9h0/bO/C4LbyvGMt/B04wOOnLsZ 0RdzqyrhTY9Io2vQfyPzz2B39M7GN8aa1eg1ansqC2MK6o9pCf8XSokLEQhgA3HgGWor dvXA== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d10-20020a170903230a00b001b3da77c1f1si13169184plh.194.2023.06.30.04.15.08; Fri, 30 Jun 2023 04:15:39 -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; 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=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232530AbjF3LKw (ORCPT + 99 others); Fri, 30 Jun 2023 07:10:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55192 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230013AbjF3LKu (ORCPT ); Fri, 30 Jun 2023 07:10:50 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B332A10B; Fri, 30 Jun 2023 04:10:48 -0700 (PDT) Received: from dggpeml500021.china.huawei.com (unknown [172.30.72.53]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4QsszM4fSRzTlsq; Fri, 30 Jun 2023 19:09:51 +0800 (CST) Received: from huawei.com (10.175.127.227) by dggpeml500021.china.huawei.com (7.185.36.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Fri, 30 Jun 2023 19:10:46 +0800 From: Baokun Li To: CC: , , , , , , , Subject: [PATCH v3 1/5] quota: factor out dquot_write_dquot() Date: Fri, 30 Jun 2023 19:08:18 +0800 Message-ID: <20230630110822.3881712-2-libaokun1@huawei.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230630110822.3881712-1-libaokun1@huawei.com> References: <20230630110822.3881712-1-libaokun1@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.127.227] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To dggpeml500021.china.huawei.com (7.185.36.21) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_PASS, 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770126037943737117?= X-GMAIL-MSGID: =?utf-8?q?1770126037943737117?= Refactor out dquot_write_dquot() to reduce duplicate code. Signed-off-by: Baokun Li --- V2->V3: No change. fs/quota/dquot.c | 39 ++++++++++++++++----------------------- 1 file changed, 16 insertions(+), 23 deletions(-) diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c index e3e4f4047657..108ba9f1e420 100644 --- a/fs/quota/dquot.c +++ b/fs/quota/dquot.c @@ -628,6 +628,18 @@ int dquot_scan_active(struct super_block *sb, } EXPORT_SYMBOL(dquot_scan_active); +static inline int dquot_write_dquot(struct dquot *dquot) +{ + int ret = dquot->dq_sb->dq_op->write_dquot(dquot); + if (ret < 0) { + quota_error(dquot->dq_sb, "Can't write quota structure " + "(error %d). Quota may get out of sync!", ret); + /* Clear dirty bit anyway to avoid infinite loop. */ + clear_dquot_dirty(dquot); + } + return ret; +} + /* Write all dquot structures to quota files */ int dquot_writeback_dquots(struct super_block *sb, int type) { @@ -658,16 +670,9 @@ int dquot_writeback_dquots(struct super_block *sb, int type) * use count */ dqgrab(dquot); spin_unlock(&dq_list_lock); - err = sb->dq_op->write_dquot(dquot); - if (err) { - /* - * Clear dirty bit anyway to avoid infinite - * loop here. - */ - clear_dquot_dirty(dquot); - if (!ret) - ret = err; - } + err = dquot_write_dquot(dquot); + if (err && !ret) + ret = err; dqput(dquot); spin_lock(&dq_list_lock); } @@ -765,8 +770,6 @@ static struct shrinker dqcache_shrinker = { */ void dqput(struct dquot *dquot) { - int ret; - if (!dquot) return; #ifdef CONFIG_QUOTA_DEBUG @@ -794,17 +797,7 @@ void dqput(struct dquot *dquot) if (dquot_dirty(dquot)) { spin_unlock(&dq_list_lock); /* Commit dquot before releasing */ - ret = dquot->dq_sb->dq_op->write_dquot(dquot); - if (ret < 0) { - quota_error(dquot->dq_sb, "Can't write quota structure" - " (error %d). Quota may get out of sync!", - ret); - /* - * We clear dirty bit anyway, so that we avoid - * infinite loop here - */ - clear_dquot_dirty(dquot); - } + dquot_write_dquot(dquot); goto we_slept; } if (test_bit(DQ_ACTIVE_B, &dquot->dq_flags)) {