[f2fs-dev] f2fs: introduce F2FS_QUOTA_DEFAULT_FL for cleanup

Commit Message

Chao Yu June 6, 2023, 6:18 a.m. UTC

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 <[e-mail]>
---
 fs/f2fs/f2fs.h  | 2 ++
 fs/f2fs/super.c | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

Comments

[e-mail] June 12, 2023, 8:50 p.m. UTC | #1

Hello:

This patch was applied to jaegeuk/f2fs.git (dev)
by Jaegeuk Kim <[e-mail]>:

On Tue,  6 Jun 2023 14:18:22 +0800 you wrote:
> 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 <[e-mail]>
> ---
>  fs/f2fs/f2fs.h  | 2 ++
>  fs/f2fs/super.c | 6 +++---
>  2 files changed, 5 insertions(+), 3 deletions(-)

Here is the summary with links:
  - [f2fs-dev] f2fs: introduce F2FS_QUOTA_DEFAULT_FL for cleanup
    https://git.kernel.org/jaegeuk/f2fs/c/4138d5a9121b

You are awesome, thank you!

Patch

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);