From patchwork Wed Jun 28 13:21:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baokun Li X-Patchwork-Id: 113871 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp8928456vqr; Wed, 28 Jun 2023 06:31:37 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4SfY9rAopT52UhoWZ8ZFKHfbe8ZfsfQb5xItwkg7aO0eGrSswV70tXZpylxZ/gVYlLtgb1 X-Received: by 2002:a05:6a20:8e1b:b0:125:213e:8b66 with SMTP id y27-20020a056a208e1b00b00125213e8b66mr14919152pzj.28.1687959097247; Wed, 28 Jun 2023 06:31:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687959097; cv=none; d=google.com; s=arc-20160816; b=FDgtCvmltZRDXzGJFIV4YBrgmgFeFrdo38KOYcq6AtQBfMAsBPwzoeywtZNO/AJ9dO YqtB7Z23lNWk3oB+UaCNAuHcVr/3J4pTsChfvrN01Cq7z3HSlGiaq8Z13w9wKZy9U8Hs PKD/STjOlAzgxIWJoqFk4y4McK/z8pfXGOztehQt2p1lm/YbM8z6baETHD2MWeX5m1qH d/Oycf1BnwqtV9G2jaUS6oDdf/vhBJCNau9OoycAQvSa74fOhidzb8eevGZxOc3jHiYJ uTm3EUxkriLh7zpUlpShcb+r813BQ/RZfx+7kgkXEsQd46aPx3k+OS+fw5nzsLEoNJH5 UdhA== 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=syM0hcQxTJsShWhfN1kWH5AhV9+RRj6vXlNxOLW+/UE=; fh=fHzCyx2lgDg5rzxkd+fn4L1zIOfYfCj3lN8BN24cVWY=; b=AAeNVB/37YNd4W62TlNgmOT6sPByL8cQ5vse9xM2eNx7zgzpSxqLD+2cnu7KTDE3rh hUCmkM9GxZhazbSegfRHkm4d9hsVQpR5SDmIkjrlcgOh2OABjro1e3F7wPvw2UtP9dzh qr2oTAIjtHZuquE5aSYKYbmJ588/M+/Flw60ZHbSA8Dn1eqlt0zRLczUd3VveYbKn3MJ nMAV7iKXiG2Kk5ekRYAvZP3ZSO4EQiM30mHHi10Q4TiwHqUc5ts4arY0SPb1JLyNSBEt VyMMmp1O5nR8091SdlIjN5seO1yBT/HD9SfeV0rYmc9wL6VTvs4A1iXcdGI+y0T4gzyC k7tw== 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 p5-20020a056a0026c500b00666acab17acsi7592897pfw.318.2023.06.28.06.31.22; Wed, 28 Jun 2023 06:31:37 -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 S231928AbjF1NY2 (ORCPT + 99 others); Wed, 28 Jun 2023 09:24:28 -0400 Received: from szxga08-in.huawei.com ([45.249.212.255]:19164 "EHLO szxga08-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231847AbjF1NYU (ORCPT ); Wed, 28 Jun 2023 09:24:20 -0400 Received: from dggpeml500021.china.huawei.com (unknown [172.30.72.57]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4Qrj345pnmz1HC5r; Wed, 28 Jun 2023 21:24:00 +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; Wed, 28 Jun 2023 21:24:16 +0800 From: Baokun Li To: CC: , , , , , , , Subject: [PATCH v2 1/7] quota: factor out dquot_write_dquot() Date: Wed, 28 Jun 2023 21:21:49 +0800 Message-ID: <20230628132155.1560425-2-libaokun1@huawei.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230628132155.1560425-1-libaokun1@huawei.com> References: <20230628132155.1560425-1-libaokun1@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.127.227] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To dggpeml500021.china.huawei.com (7.185.36.21) X-CFilter-Loop: Reflected 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?1769953397961683718?= X-GMAIL-MSGID: =?utf-8?q?1769953397961683718?= Refactor out dquot_write_dquot() to reduce duplicate code. Signed-off-by: Baokun Li --- 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)) {