f2fs: cleanup waiting routine for writeback completion during cp
Subsystems (2)
PATCH 1/1 f2fs: cleanup waiting routine for writeback completion during cp
use general method supported by kernel
Signed-off-by Changman Lee <[email protected]>
--- fs/f2fs/checkpoint.c | 25 ++++++++++++++++--------- fs/f2fs/f2fs.h | 2 +- fs/f2fs/segment.c | 4 ++-- fs/f2fs/super.c | 1 + 4 files changed, 20 insertions(+), 12 deletions(-)
fs/f2fs/checkpoint.c +16 -9
@@ -632,6 +632,21 @@ static void unblock_operations(struct f2fs_sb_info *sbi)f2fs_unlock_all (sbi); } +static void wait_for_writeback_pages (struct f2fs_sb_info *sbi) +{ +DEFINE_WAIT (wait); + +for (;;) { +prepare_to_wait (&sbi->cp_wait, &wait,TASK_UNINTERRUPTIBLE ); + +if (!get_pages (sbi,F2FS_WRITEBACK )) +break ; + +io_schedule (); + } +finish_wait (&sbi->cp_wait, &wait); +} +static void do_checkpoint (struct f2fs_sb_info *sbi,bool is_umount) {struct f2fs_checkpoint *ckpt =F2FS_CKPT (sbi);
@@ -741,15 +756,7 @@ static void do_checkpoint(struct f2fs_sb_info *sbi, bool is_umount)f2fs_put_page (cp_page,1 );/* wait for previous submitted node/meta pages writeback */ - sbi->cp_task = current; -while (get_pages (sbi,F2FS_WRITEBACK )) { -set_current_state (TASK_UNINTERRUPTIBLE ); -if (!get_pages (sbi,F2FS_WRITEBACK )) -break ; -io_schedule (); - } -__set_current_state (TASK_RUNNING ); - sbi->cp_task =NULL ; +wait_for_writeback_pages (sbi);filemap_fdatawait_range (sbi->node_inode->i_mapping,0 ,LONG_MAX );filemap_fdatawait_range (sbi->meta_inode->i_mapping,0 ,LONG_MAX );
fs/f2fs/f2fs.h +1 -1
@@ -363,7 +363,7 @@ struct f2fs_sb_info {struct mutex writepages;/* mutex for writepages() */ bool por_doing;/* recovery is doing or not */ bool on_build_free_nids;/* build_free_nids is doing */ -struct task_struct *cp_task;/* checkpoint task */ +wait_queue_head_t cp_wait;/* for orphan inode management */ struct list_head orphan_inode_list;/* orphan inode list */
fs/f2fs/segment.c +2 -2
@@ -597,8 +597,8 @@ static void f2fs_end_io_write(struct bio *bio, int err)if (p->is_sync)complete (p->wait); -if (!get_pages (p->sbi,F2FS_WRITEBACK ) && p->sbi->cp_task) -wake_up_process (p->sbi->cp_task); +if (!get_pages (p->sbi,F2FS_WRITEBACK )) +wake_up (&p->sbi->cp_wait);kfree (p);bio_put (bio);
fs/f2fs/super.c +1 -0
@@ -854,6 +854,7 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent)spin_lock_init (&sbi->stat_lock);init_rwsem (&sbi->bio_sem);init_rwsem (&sbi->cp_rwsem); +init_waitqueue_head (&sbi->cp_wait);init_sb_info (sbi);/* get an inode for meta space */
Signature · 9 lines
1.7.9.5 ------------------------------------------------------------------------------ Android is increasing in popularity, but the open development platform that developers love is also attractive to malware creators. Download this white paper to learn more about secure code signing practices that can help keep Android apps secure. http://pubads.g.doubleclick.net/gampad/clk?id=65839951&iu=/4140/ostg.clktrk