use general method supported by kernel
Signed-off-by: Changman Lee <cm224....@samsung.com>
---
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(-)
diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c
index 5649a9d..f39c92e 100644
--- a/fs/f2fs/checkpoint.c
+++ b/fs/f2fs/checkpoint.c
@@ -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);
diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 590a09e..e0e4515 100644
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -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 */
diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index 9af59fb..b690b9b 100644
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -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);
diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index 9a09459..5cea7f6 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -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 */
--
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
_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
