f2fs: do SSR in higher priority

[linux.git] / fs / f2fs / node.h

diff --git a/fs/f2fs/node.h b/fs/f2fs/node.h
index e7997e2403660799de6ed30605f5b090e938fd5f..d3d2893064695005fab9fa362ce44b00fba070ce 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);
 }
 
@@ -203,6 +209,12 @@ static inline pgoff_t current_nat_addr(struct f2fs_sb_info *sbi, nid_t start)
                (seg_off << sbi->log_blocks_per_seg << 1) +
                (block_off & (sbi->blocks_per_seg - 1)));
 
+#ifdef CONFIG_F2FS_CHECK_FS
+       if (f2fs_test_bit(block_off, nm_i->nat_bitmap) !=
+                       f2fs_test_bit(block_off, nm_i->nat_bitmap_mir))
+               f2fs_bug_on(sbi, 1);
+#endif
+
        if (f2fs_test_bit(block_off, nm_i->nat_bitmap))
                block_addr += sbi->blocks_per_seg;
 
@@ -228,6 +240,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)
@@ -343,7 +358,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)