Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-microblaze.git] / fs / f2fs / node.c

diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
index cb1b5b6..d5d8ce0 100644 (file)
--- a/fs/f2fs/node.c
+++ b/fs/f2fs/node.c
@@ -109,7 +109,7 @@ static void clear_node_page_dirty(struct page *page)
 
 static struct page *get_current_nat_page(struct f2fs_sb_info *sbi, nid_t nid)
 {
-       return f2fs_get_meta_page_nofail(sbi, current_nat_addr(sbi, nid));
+       return f2fs_get_meta_page(sbi, current_nat_addr(sbi, nid));
 }
 
 static struct page *get_next_nat_page(struct f2fs_sb_info *sbi, nid_t nid)
@@ -3105,9 +3105,6 @@ static int init_node_manager(struct f2fs_sb_info *sbi)
        nm_i->next_scan_nid = le32_to_cpu(sbi->ckpt->next_free_nid);
        nm_i->bitmap_size = __bitmap_size(sbi, NAT_BITMAP);
        version_bitmap = __bitmap_ptr(sbi, NAT_BITMAP);
-       if (!version_bitmap)
-               return -EFAULT;
-
        nm_i->nat_bitmap = kmemdup(version_bitmap, nm_i->bitmap_size,
                                        GFP_KERNEL);
        if (!nm_i->nat_bitmap)
@@ -3257,7 +3254,7 @@ void f2fs_destroy_node_manager(struct f2fs_sb_info *sbi)
        kvfree(nm_i->nat_bitmap_mir);
 #endif
        sbi->nm_info = NULL;
-       kvfree(nm_i);
+       kfree(nm_i);
 }
 
 int __init f2fs_create_node_manager_caches(void)