Received: by 2002:a05:6358:3188:b0:123:57c1:9b43 with SMTP id q8csp6661689rwd; Mon, 5 Jun 2023 23:31:10 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ76dw9wWvfI445SHvqSEE7A4x9BjgMc2fxieMrQU68Jp4s23x9jY9SczEDRKZ4MwzgCzQQC X-Received: by 2002:a9d:6302:0:b0:6b1:5f2c:dcac with SMTP id q2-20020a9d6302000000b006b15f2cdcacmr1224932otk.33.1686033070380; Mon, 05 Jun 2023 23:31:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686033070; cv=none; d=google.com; s=arc-20160816; b=PebJb9ybc9O1prlyrHpx+2CmnG0a0uN85sFMJoru+fYRsLbsMCDcFNwmNCEGr7MSGf pQyAEhSfBI6cNprB9O0KcfBU1HrHqtr5ha31U95yoSOX3vZrGTiKVFULEaauh1U+WWjh vTsZV/YrdbjqS2VImS7FNqY9YlLY7wbJCER84EqhHw7ayGPe7UvAtsHRKHeSiHTRTdD3 B4ftGpoIEmz68xLq5beziyCaqra7QuhiSW5ae6WySQBcfWT+THU7D+G5FpioshQdFMEL ellqx0+IQraC4o9GyaRcKQ0wPvqpsNfaVa2Ud9X413u55ftybKjwwrLt3Ndiha45uRgT 790A== 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=k6Qx/xMPr+kzYD1hOe4hVls9Kjx8yW51XQY3FeFSJVY=; b=uUjImYbItSM17mVLR+Cv5SRtJRr4A1UlAu9k3x5KKPArQOuhrvzPe7medRJtQhmHTq u4IvMEWEaTjUmvjE4RuyLjucrU5zu7GHZoWewdG5PG6wvnXP3qapiQRDTfRxQltRrPix jGusp/xZtpiPWplJrR41JRp/RUUN/uoB6vyRmmERNlOeHw8nXQMg3qNY4usRlj67fKJc Y6d1LCaTgH6fT2RUqjcw+2Z+tjepAmwzLV4/47UHvN/6KouEUXH2gk+7vthcsH2FhVCi yUgYaooO3PLIUZqBEES0d+/bOYSPdFeKHF00BVfLh+s9jBZXzFIwIZMRAhjIj7eJ5UPZ 6S+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=EiVnNsPF; 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=kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a3-20020a637043000000b0053fb78a9abesi6757132pgn.411.2023.06.05.23.30.57; Mon, 05 Jun 2023 23:31:10 -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=@kernel.org header.s=k20201202 header.b=EiVnNsPF; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233695AbjFFGSb (ORCPT + 99 others); Tue, 6 Jun 2023 02:18:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60986 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232382AbjFFGS3 (ORCPT ); Tue, 6 Jun 2023 02:18:29 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F338392 for ; Mon, 5 Jun 2023 23:18:28 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 9043E62238 for ; Tue, 6 Jun 2023 06:18:28 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BDE80C433EF; Tue, 6 Jun 2023 06:18:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1686032308; bh=CAju/ke6dt0cBKQdvWsNhZJ0D4UzuH6zEahi6D9GmtI=; h=From:To:Cc:Subject:Date:From; b=EiVnNsPFHFRKQftqEpwmVzgJ8nZeLuoduHTiLIABkpRdCIwY4wWMrnLWpwuMXUTIf v1c9yWo2Lrus9JoNN7XOL6Nab9JmR/8/SUGZ+eSq1wOdk698nL0DSKgVA6ob0FH8iD kTsC35KqwnBrP9nSKF5wSYEdqU+uObW18F2f4OsFl3rsnmzRpjI2pp9SsdC8DV3sw6 R7MoB102bJbpGuKKY9ip87gPSk+lTc2PGtEE/03O7JvElEE+m2dypXdaPQYxKeyyGZ XO6bD6dLpK7/dtd1sZemwU4trEk/6+wSpsb1EIL9yS2xrPmb5zUlRlgBr1I88nyOr3 cTSuqipWPiE1g== From: Chao Yu To: jaegeuk@kernel.org Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, Chao Yu Subject: [PATCH] f2fs: introduce F2FS_QUOTA_DEFAULT_FL for cleanup Date: Tue, 6 Jun 2023 14:18:22 +0800 Message-Id: <20230606061822.1179551-1-chao@kernel.org> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, 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 This patch adds F2FS_QUOTA_DEFAULT_FL to include two default flags: F2FS_NOATIME_FL and F2FS_IMMUTABLE_FL, and use it to clean up codes. Signed-off-by: Chao Yu --- fs/f2fs/f2fs.h | 2 ++ fs/f2fs/super.c | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index 35ea9165801e..525381bb6050 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -2967,6 +2967,8 @@ static inline void f2fs_change_bit(unsigned int nr, char *addr) #define F2FS_PROJINHERIT_FL 0x20000000 /* Create with parents projid */ #define F2FS_CASEFOLD_FL 0x40000000 /* Casefolded file */ +#define F2FS_QUOTA_DEFAULT_FL (F2FS_NOATIME_FL | F2FS_IMMUTABLE_FL) + /* Flags that should be inherited by new inodes from their parent. */ #define F2FS_FL_INHERITED (F2FS_SYNC_FL | F2FS_NODUMP_FL | F2FS_NOATIME_FL | \ F2FS_DIRSYNC_FL | F2FS_PROJINHERIT_FL | \ diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index 6861b255a9a6..5f3e3f328f10 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -2782,7 +2782,7 @@ static int f2fs_quota_enable(struct super_block *sb, int type, int format_id, { struct inode *qf_inode; unsigned long qf_inum; - unsigned long qf_flag = F2FS_NOATIME_FL | F2FS_IMMUTABLE_FL; + unsigned long qf_flag = F2FS_QUOTA_DEFAULT_FL; int err; BUG_ON(!f2fs_sb_has_quota_ino(F2FS_SB(sb))); @@ -2959,7 +2959,7 @@ static int f2fs_quota_on(struct super_block *sb, int type, int format_id, return err; inode_lock(inode); - F2FS_I(inode)->i_flags |= F2FS_NOATIME_FL | F2FS_IMMUTABLE_FL; + F2FS_I(inode)->i_flags |= F2FS_QUOTA_DEFAULT_FL; f2fs_set_inode_flags(inode); inode_unlock(inode); f2fs_mark_inode_dirty_sync(inode, false); @@ -2984,7 +2984,7 @@ static int __f2fs_quota_off(struct super_block *sb, int type) goto out_put; inode_lock(inode); - F2FS_I(inode)->i_flags &= ~(F2FS_NOATIME_FL | F2FS_IMMUTABLE_FL); + F2FS_I(inode)->i_flags &= ~F2FS_QUOTA_DEFAULT_FL; f2fs_set_inode_flags(inode); inode_unlock(inode); f2fs_mark_inode_dirty_sync(inode, false); -- 2.40.1