f2fs: clean up argument of recover_data
authorChao Yu <chao2.yu@samsung.com>
Tue, 1 Dec 2015 03:43:59 +0000 (11:43 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 26 Jan 2019 08:42:45 +0000 (09:42 +0100)
commit b7973f2378c619d0e17a075f13350bd58a9ebe3d upstream.

In recover_data, value of argument 'type' will be CURSEG_WARM_NODE all
the time, remove it for cleanup.

Signed-off-by: Chao Yu <chao2.yu@samsung.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
[bwh: Picked as dependency of commit 6781eabba1bd "f2fs: give -EINVAL for
 norecovery and rw mount"]
Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
fs/f2fs/recovery.c

index e32f349..c6f5082 100644 (file)
@@ -459,8 +459,7 @@ out:
        return err;
 }
 
-static int recover_data(struct f2fs_sb_info *sbi,
-                               struct list_head *head, int type)
+static int recover_data(struct f2fs_sb_info *sbi, struct list_head *head)
 {
        unsigned long long cp_ver = cur_cp_version(F2FS_CKPT(sbi));
        struct curseg_info *curseg;
@@ -469,7 +468,7 @@ static int recover_data(struct f2fs_sb_info *sbi,
        block_t blkaddr;
 
        /* get node pages in the current segment */
-       curseg = CURSEG_I(sbi, type);
+       curseg = CURSEG_I(sbi, CURSEG_WARM_NODE);
        blkaddr = NEXT_FREE_BLKADDR(sbi, curseg);
 
        while (1) {
@@ -556,7 +555,7 @@ int recover_fsync_data(struct f2fs_sb_info *sbi)
        need_writecp = true;
 
        /* step #2: recover data */
-       err = recover_data(sbi, &inode_list, CURSEG_WARM_NODE);
+       err = recover_data(sbi, &inode_list);
        if (!err)
                f2fs_bug_on(sbi, !list_empty(&inode_list));
 out: