FS: F2FS: Use jiffies

Signed-off-by: Joe Maples <joe@frap129.org>

7 files changed, 9 insertions, 8 deletions

diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c
index 968cae2b1..88b9eb236 100644
--- a/fs/f2fs/checkpoint.c
+++ b/fs/f2fs/checkpoint.c
@@ -1056,7 +1056,7 @@ static void wait_on_all_pages_writeback(struct f2fs_sb_info *sbi)
 		if (!get_pages(sbi, F2FS_WB_CP_DATA))
 			break;
 
-		io_schedule_timeout(5*HZ);
+		io_schedule_timeout(msecs_to_jiffies(5000));
 	}
 	finish_wait(&sbi->cp_wait, &wait);
 }
diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 1e7637dfd..81584aea3 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -1351,7 +1351,7 @@ retry_encrypt:
 	/* flush pending IOs and wait for a while in the ENOMEM case */
 	if (PTR_ERR(fio->encrypted_page) == -ENOMEM) {
 		f2fs_flush_merged_writes(fio->sbi);
-		congestion_wait(BLK_RW_ASYNC, HZ/50);
+		congestion_wait(BLK_RW_ASYNC, msecs_to_jiffies(20));
 		gfp_flags |= __GFP_NOFAIL;
 		goto retry_encrypt;
 	}
diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c
index bb792828e..9bbb7016b 100644
--- a/fs/f2fs/gc.c
+++ b/fs/f2fs/gc.c
@@ -747,7 +747,7 @@ retry:
 
 		err = do_write_data_page(&fio);
 		if (err == -ENOMEM && is_dirty) {
-			congestion_wait(BLK_RW_ASYNC, HZ/50);
+			congestion_wait(BLK_RW_ASYNC, msecs_to_jiffies(20));
 			goto retry;
 		}
 	}
diff --git a/fs/f2fs/inode.c b/fs/f2fs/inode.c
index 1720ed6e4..0ae10fa4b 100644
--- a/fs/f2fs/inode.c
+++ b/fs/f2fs/inode.c
@@ -244,7 +244,7 @@ retry:
 	inode = f2fs_iget(sb, ino);
 	if (IS_ERR(inode)) {
 		if (PTR_ERR(inode) == -ENOMEM) {
-			congestion_wait(BLK_RW_ASYNC, HZ/50);
+			congestion_wait(BLK_RW_ASYNC, msecs_to_jiffies(20));
 			goto retry;
 		}
 	}
diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
index 8ab64df95..97b9611f1 100644
--- a/fs/f2fs/node.c
+++ b/fs/f2fs/node.c
@@ -2263,7 +2263,7 @@ int recover_inode_page(struct f2fs_sb_info *sbi, struct page *page)
 retry:
 	ipage = f2fs_grab_cache_page(NODE_MAPPING(sbi), ino, false);
 	if (!ipage) {
-		congestion_wait(BLK_RW_ASYNC, HZ/50);
+		congestion_wait(BLK_RW_ASYNC, msecs_to_jiffies(20));
 		goto retry;
 	}
 
diff --git a/fs/f2fs/recovery.c b/fs/f2fs/recovery.c
index 20147d297..2476783db 100644
--- a/fs/f2fs/recovery.c
+++ b/fs/f2fs/recovery.c
@@ -399,7 +399,7 @@ retry_dn:
 	err = get_dnode_of_data(&dn, start, ALLOC_NODE);
 	if (err) {
 		if (err == -ENOMEM) {
-			congestion_wait(BLK_RW_ASYNC, HZ/50);
+			congestion_wait(BLK_RW_ASYNC, msecs_to_jiffies(20));
 			goto retry_dn;
 		}
 		goto out;
@@ -461,7 +461,8 @@ retry_prev:
 			err = check_index_in_prev_nodes(sbi, dest, &dn);
 			if (err) {
 				if (err == -ENOMEM) {
-					congestion_wait(BLK_RW_ASYNC, HZ/50);
+					congestion_wait(BLK_RW_ASYNC,
+							msecs_to_jiffies(20));
 					goto retry_prev;
 				}
 				goto err;
diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index bc85132a1..02f51c2b6 100644
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -1268,7 +1268,7 @@ static int issue_discard_thread(void *data)
 		__issue_discard_cmd(sbi, true);
 		__wait_discard_cmd(sbi, true);
 
-		congestion_wait(BLK_RW_SYNC, HZ/50);
+		congestion_wait(BLK_RW_SYNC, msecs_to_jiffies(20));
 	} while (!kthread_should_stop());
 	return 0;
 }