Merge tag 'f2fs-for-6.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk...

[linux-block.git] / fs / f2fs / checkpoint.c

diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c
index 5a5515d83a1b9187e265259629c49e6e05f1d65b..c3e058e0a01882357aaa575c02c9bb903bca2b93 100644 (file)
--- a/fs/f2fs/checkpoint.c
+++ b/fs/f2fs/checkpoint.c
@@ -70,7 +70,7 @@ static struct page *__get_meta_page(struct f2fs_sb_info *sbi, pgoff_t index,
                .old_blkaddr = index,
                .new_blkaddr = index,
                .encrypted_page = NULL,
-               .is_por = !is_meta,
+               .is_por = !is_meta ? 1 : 0,
        };
        int err;
 
@@ -171,10 +171,8 @@ static bool __is_bitmap_valid(struct f2fs_sb_info *sbi, block_t blkaddr,
 bool f2fs_is_valid_blkaddr(struct f2fs_sb_info *sbi,
                                        block_t blkaddr, int type)
 {
-       if (time_to_inject(sbi, FAULT_BLKADDR)) {
-               f2fs_show_injection_info(sbi, FAULT_BLKADDR);
+       if (time_to_inject(sbi, FAULT_BLKADDR))
                return false;
-       }
 
        switch (type) {
        case META_NAT:
@@ -239,8 +237,8 @@ int f2fs_ra_meta_pages(struct f2fs_sb_info *sbi, block_t start, int nrpages,
                .op = REQ_OP_READ,
                .op_flags = sync ? (REQ_META | REQ_PRIO) : REQ_RAHEAD,
                .encrypted_page = NULL,
-               .in_list = false,
-               .is_por = (type == META_POR),
+               .in_list = 0,
+               .is_por = (type == META_POR) ? 1 : 0,
        };
        struct blk_plug plug;
        int err;
@@ -625,7 +623,6 @@ int f2fs_acquire_orphan_inode(struct f2fs_sb_info *sbi)
 
        if (time_to_inject(sbi, FAULT_ORPHAN)) {
                spin_unlock(&im->ino_lock);
-               f2fs_show_injection_info(sbi, FAULT_ORPHAN);
                return -ENOSPC;
        }
 
@@ -798,7 +795,7 @@ static void write_orphan_inodes(struct f2fs_sb_info *sbi, block_t start_blk)
         */
        head = &im->ino_list;
 
-       /* loop for each orphan inode entry and write them in Jornal block */
+       /* loop for each orphan inode entry and write them in journal block */
        list_for_each_entry(orphan, head, list) {
                if (!page) {
                        page = f2fs_grab_meta_page(sbi, start_blk++);
@@ -1128,7 +1125,7 @@ retry:
        } else {
                /*
                 * We should submit bio, since it exists several
-                * wribacking dentry pages in the freeing inode.
+                * writebacking dentry pages in the freeing inode.
                 */
                f2fs_submit_merged_write(sbi, DATA);
                cond_resched();
@@ -1476,20 +1473,18 @@ static int do_checkpoint(struct f2fs_sb_info *sbi, struct cp_control *cpc)
        ckpt->elapsed_time = cpu_to_le64(get_mtime(sbi, true));
        ckpt->free_segment_count = cpu_to_le32(free_segments(sbi));
        for (i = 0; i < NR_CURSEG_NODE_TYPE; i++) {
-               ckpt->cur_node_segno[i] =
-                       cpu_to_le32(curseg_segno(sbi, i + CURSEG_HOT_NODE));
-               ckpt->cur_node_blkoff[i] =
-                       cpu_to_le16(curseg_blkoff(sbi, i + CURSEG_HOT_NODE));
-               ckpt->alloc_type[i + CURSEG_HOT_NODE] =
-                               curseg_alloc_type(sbi, i + CURSEG_HOT_NODE);
+               struct curseg_info *curseg = CURSEG_I(sbi, i + CURSEG_HOT_NODE);
+
+               ckpt->cur_node_segno[i] = cpu_to_le32(curseg->segno);
+               ckpt->cur_node_blkoff[i] = cpu_to_le16(curseg->next_blkoff);
+               ckpt->alloc_type[i + CURSEG_HOT_NODE] = curseg->alloc_type;
        }
        for (i = 0; i < NR_CURSEG_DATA_TYPE; i++) {
-               ckpt->cur_data_segno[i] =
-                       cpu_to_le32(curseg_segno(sbi, i + CURSEG_HOT_DATA));
-               ckpt->cur_data_blkoff[i] =
-                       cpu_to_le16(curseg_blkoff(sbi, i + CURSEG_HOT_DATA));
-               ckpt->alloc_type[i + CURSEG_HOT_DATA] =
-                               curseg_alloc_type(sbi, i + CURSEG_HOT_DATA);
+               struct curseg_info *curseg = CURSEG_I(sbi, i + CURSEG_HOT_DATA);
+
+               ckpt->cur_data_segno[i] = cpu_to_le32(curseg->segno);
+               ckpt->cur_data_blkoff[i] = cpu_to_le16(curseg->next_blkoff);
+               ckpt->alloc_type[i + CURSEG_HOT_DATA] = curseg->alloc_type;
        }
 
        /* 2 cp + n data seg summary + orphan inode blocks */