Merge branch 'printk-cleanups'

[cascardo/linux.git] / fs / f2fs / inline.c

diff --git a/fs/f2fs/inline.c b/fs/f2fs/inline.c
index 8a96107..34234d8 100644 (file)
--- a/fs/f2fs/inline.c
+++ b/fs/f2fs/inline.c
@@ -445,8 +445,8 @@ static int f2fs_move_rehashed_dirents(struct inode *dir, struct page *ipage,
        struct f2fs_inline_dentry *backup_dentry;
        int err;
 
-       backup_dentry = f2fs_kmalloc(sizeof(struct f2fs_inline_dentry),
-                                                       GFP_F2FS_ZERO);
+       backup_dentry = f2fs_kmalloc(F2FS_I_SB(dir),
+                       sizeof(struct f2fs_inline_dentry), GFP_F2FS_ZERO);
        if (!backup_dentry) {
                f2fs_put_page(ipage, 1);
                return -ENOMEM;
@@ -566,7 +566,7 @@ void f2fs_delete_inline_entry(struct f2fs_dir_entry *dentry, struct page *page,
        inline_dentry = inline_data_addr(page);
        bit_pos = dentry - inline_dentry->dentry;
        for (i = 0; i < slots; i++)
-               test_and_clear_bit_le(bit_pos + i,
+               __clear_bit_le(bit_pos + i,
                                &inline_dentry->dentry_bitmap);
 
        set_page_dirty(page);