f2fs: do not write any node pages related to orphan inodes
Subsystems (2)
Jaegeuk Kim
maintainerPATCH 1/1 f2fs: do not write any node pages related to orphan inodes
We should not write node pages when deleting orphan inodes.
In order to do that, we can eaisly set POR_DOING flag earlier before entering orphan inode routine.
--- fs/f2fs/recovery.c | 3 --- fs/f2fs/super.c | 6 +++++- 2 files changed, 5 insertions(+), 4 deletions(-)
fs/f2fs/recovery.c +0 -3
@@ -545,9 +545,6 @@ int recover_fsync_data(struct f2fs_sb_info *sbi)INIT_LIST_HEAD (&inode_list); -/* step #1: find fsynced inode numbers */ -set_sbi_flag (sbi,SBI_POR_DOING ); -/* prevent checkpoint */ mutex_lock (&sbi->cp_mutex);
fs/f2fs/super.c +5 -1
@@ -1165,7 +1165,9 @@ try_onemore:mutex_init (&sbi->writepages);mutex_init (&sbi->cp_mutex);init_rwsem (&sbi->node_write); -clear_sbi_flag (sbi,SBI_POR_DOING ); + +/* disallow all the data/node/meta page writes */ +set_sbi_flag (sbi,SBI_POR_DOING );spin_lock_init (&sbi->stat_lock);init_rwsem (&sbi->read_io.io_rwsem);
@@ -1309,6 +1311,8 @@ try_onemore: goto free_kobj; } } +/* recover_fsync_data() cleared this already */ +clear_sbi_flag (sbi,SBI_POR_DOING );/* * If filesystem is not mounted as read-only then
Signature · 1 line
2.1.1
Hi Jaegeuk,
Quoted 11 lines
-----Original Message-----
From: Jaegeuk Kim [mailto:[email protected]]
Sent: Wednesday, August 12, 2015 6:03 AM
To: [email protected]; [email protected]; [email protected]
Cc: Jaegeuk Kim
Subject: [f2fs-dev] [PATCH] f2fs: do not write any node pages related to orphan inodesWe should not write node pages when deleting orphan inodes.
In order to do that, we can eaisly setPOR_DOINGflag earlier before entering orphan inode routine.
If no error occurs in recover_orphan_inodes, it will clear SBI_POR_DOING before return, so our protect region is broken since we remove SBI_POR_DOING setting in the beginning of recover_fsync_data.
How about removing all SBI_POR_DOING related ops in recover_orphan_inodes?
Quoted 12 lines
Signed-off-by Jaegeuk Kim <[email protected]>--- fs/f2fs/recovery.c | 3 --- fs/f2fs/super.c | 6 +++++- 2 files changed, 5 insertions(+), 4 deletions(-)fs/f2fs/recovery.c +0
-0
fs/f2fs/recovery.c int recover_fsync_data(struct f2fs_sb_info *sbi) · line 548
Quoted 4 lines
fs/f2fs/recovery.c +0
-1@@ -545,9 +545,6 @@ int recover_fsync_data(struct f2fs_sb_info *sbi)INIT_LIST_HEAD (&inode_list); -/* step #1: find fsynced inode numbers */
Nitpick, this makes the left comment "/* step #2: recover data */" looks strange, how about modifying the left one too?
Thanks,
Jaegeuk Kim
maintainerChang log from v1:
- remove inappropriate remained flag ops suggested by Chao
Thanks,
Quoted 1 line
From
8ab2c8bacedb74d35dfe481d43a8fb1291650c39Mon Sep 17 00:00:00 2001
From: Jaegeuk Kim <[email protected]>
Date: Tue, 11 Aug 2015 12:45:39 -0700
Subject: [PATCH] f2fs: do not write any node pages related to orphan inodes
We should not write node pages when deleting orphan inodes.
In order to do that, we can eaisly set POR_DOING flag earlier before entering orphan inode routine.
--- fs/f2fs/checkpoint.c | 4 ---- fs/f2fs/recovery.c | 4 +--- fs/f2fs/super.c | 6 +++++- 3 files changed, 6 insertions(+), 8 deletions(-)
fs/f2fs/checkpoint.c +0 -4
@@ -497,8 +497,6 @@ int recover_orphan_inodes(struct f2fs_sb_info *sbi)if (!is_set_ckpt_flags (F2FS_CKPT (sbi),CP_ORPHAN_PRESENT_FLAG ))return 0 ; -set_sbi_flag (sbi,SBI_POR_DOING ); - start_blk =__start_cp_addr (sbi) +1 +__cp_payload (sbi); orphan_blocks =__start_sum_addr (sbi) -1 -__cp_payload (sbi);
@@ -514,7 +512,6 @@ int recover_orphan_inodes(struct f2fs_sb_info *sbi) err =recover_orphan_inode (sbi, ino);if (err) {f2fs_put_page (page,1 ); -clear_sbi_flag (sbi,SBI_POR_DOING );return err; } }
@@ -522,7 +519,6 @@ int recover_orphan_inodes(struct f2fs_sb_info *sbi) }/* clear Orphan Flag */ clear_ckpt_flags (F2FS_CKPT (sbi),CP_ORPHAN_PRESENT_FLAG ); -clear_sbi_flag (sbi,SBI_POR_DOING );return 0 ; }
fs/f2fs/recovery.c +1 -3
@@ -545,14 +545,12 @@ int recover_fsync_data(struct f2fs_sb_info *sbi)INIT_LIST_HEAD (&inode_list); -/* step #1: find fsynced inode numbers */ -set_sbi_flag (sbi,SBI_POR_DOING ); -/* prevent checkpoint */ mutex_lock (&sbi->cp_mutex); blkaddr =NEXT_FREE_BLKADDR (sbi, curseg); +/* step #1: find fsynced inode numbers */ err =find_fsync_dnodes (sbi, &inode_list);if (err) goto out;
fs/f2fs/super.c +5 -1
@@ -1165,7 +1165,9 @@ try_onemore:mutex_init (&sbi->writepages);mutex_init (&sbi->cp_mutex);init_rwsem (&sbi->node_write); -clear_sbi_flag (sbi,SBI_POR_DOING ); + +/* disallow all the data/node/meta page writes */ +set_sbi_flag (sbi,SBI_POR_DOING );spin_lock_init (&sbi->stat_lock);init_rwsem (&sbi->read_io.io_rwsem);
@@ -1309,6 +1311,8 @@ try_onemore: goto free_kobj; } } +/* recover_fsync_data() cleared this already */ +clear_sbi_flag (sbi,SBI_POR_DOING );/* * If filesystem is not mounted as read-only then
Signature · 1 line
2.1.1