Merge branch 'for-linus' into for-4.12/block

[karo-tx-linux.git] / fs / f2fs / node.h

diff --git a/fs/f2fs/node.h b/fs/f2fs/node.h
index e7997e2403660799de6ed30605f5b090e938fd5f..2f9603fa85a59842281b3443e4984351b2692af8 100644 (file)
--- a/fs/f2fs/node.h
+++ b/fs/f2fs/node.h
@@ -174,7 +174,7 @@ static inline void next_free_nid(struct f2fs_sb_info *sbi, nid_t *nid)
                spin_unlock(&nm_i->nid_list_lock);
                return;
        }
-       fnid = list_entry(nm_i->nid_list[FREE_NID_LIST].next,
+       fnid = list_first_entry(&nm_i->nid_list[FREE_NID_LIST],
                                                struct free_nid, list);
        *nid = fnid->nid;
        spin_unlock(&nm_i->nid_list_lock);
@@ -186,6 +186,12 @@ static inline void next_free_nid(struct f2fs_sb_info *sbi, nid_t *nid)
 static inline void get_nat_bitmap(struct f2fs_sb_info *sbi, void *addr)
 {
        struct f2fs_nm_info *nm_i = NM_I(sbi);
+
+#ifdef CONFIG_F2FS_CHECK_FS
+       if (memcmp(nm_i->nat_bitmap, nm_i->nat_bitmap_mir,
+                                               nm_i->bitmap_size))
+               f2fs_bug_on(sbi, 1);
+#endif
        memcpy(addr, nm_i->nat_bitmap, nm_i->bitmap_size);
 }
 
@@ -228,6 +234,9 @@ static inline void set_to_next_nat(struct f2fs_nm_info *nm_i, nid_t start_nid)
        unsigned int block_off = NAT_BLOCK_OFFSET(start_nid);
 
        f2fs_change_bit(block_off, nm_i->nat_bitmap);
+#ifdef CONFIG_F2FS_CHECK_FS
+       f2fs_change_bit(block_off, nm_i->nat_bitmap_mir);
+#endif
 }
 
 static inline nid_t ino_of_node(struct page *node_page)
@@ -291,14 +300,11 @@ static inline void fill_node_footer_blkaddr(struct page *page, block_t blkaddr)
 {
        struct f2fs_checkpoint *ckpt = F2FS_CKPT(F2FS_P_SB(page));
        struct f2fs_node *rn = F2FS_NODE(page);
-       size_t crc_offset = le32_to_cpu(ckpt->checksum_offset);
-       __u64 cp_ver = le64_to_cpu(ckpt->checkpoint_ver);
+       __u64 cp_ver = cur_cp_version(ckpt);
+
+       if (__is_set_ckpt_flags(ckpt, CP_CRC_RECOVERY_FLAG))
+               cp_ver |= (cur_cp_crc(ckpt) << 32);
 
-       if (__is_set_ckpt_flags(ckpt, CP_CRC_RECOVERY_FLAG)) {
-               __u64 crc = le32_to_cpu(*((__le32 *)
-                               ((unsigned char *)ckpt + crc_offset)));
-               cp_ver |= (crc << 32);
-       }
        rn->footer.cp_ver = cpu_to_le64(cp_ver);
        rn->footer.next_blkaddr = cpu_to_le32(blkaddr);
 }
@@ -306,14 +312,11 @@ static inline void fill_node_footer_blkaddr(struct page *page, block_t blkaddr)
 static inline bool is_recoverable_dnode(struct page *page)
 {
        struct f2fs_checkpoint *ckpt = F2FS_CKPT(F2FS_P_SB(page));
-       size_t crc_offset = le32_to_cpu(ckpt->checksum_offset);
        __u64 cp_ver = cur_cp_version(ckpt);
 
-       if (__is_set_ckpt_flags(ckpt, CP_CRC_RECOVERY_FLAG)) {
-               __u64 crc = le32_to_cpu(*((__le32 *)
-                               ((unsigned char *)ckpt + crc_offset)));
-               cp_ver |= (crc << 32);
-       }
+       if (__is_set_ckpt_flags(ckpt, CP_CRC_RECOVERY_FLAG))
+               cp_ver |= (cur_cp_crc(ckpt) << 32);
+
        return cp_ver == cpver_of_node(page);
 }
 
@@ -343,7 +346,7 @@ static inline bool IS_DNODE(struct page *node_page)
        unsigned int ofs = ofs_of_node(node_page);
 
        if (f2fs_has_xattr_block(ofs))
-               return false;
+               return true;
 
        if (ofs == 3 || ofs == 4 + NIDS_PER_BLOCK ||
                        ofs == 5 + 2 * NIDS_PER_BLOCK)