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

[sfrench/cifs-2.6.git] / fs / f2fs / inline.c

diff --git a/fs/f2fs/inline.c b/fs/f2fs/inline.c
index 0ccdefe9fdbab85d83d09816792ff12c25f56756..e4c527c4e7d0b382907b0c8fbf95d0f15f4bbc09 100644 (file)
--- a/fs/f2fs/inline.c
+++ b/fs/f2fs/inline.c
@@ -298,7 +298,7 @@ struct f2fs_dir_entry *find_in_inline_dir(struct inode *dir,
                return NULL;
        }
 
-       namehash = f2fs_dentry_hash(&name);
+       namehash = f2fs_dentry_hash(&name, fname);
 
        inline_dentry = inline_data_addr(ipage);
 
@@ -533,7 +533,7 @@ int f2fs_add_inline_entry(struct inode *dir, const struct qstr *new_name,
 
        f2fs_wait_on_page_writeback(ipage, NODE, true);
 
-       name_hash = f2fs_dentry_hash(new_name);
+       name_hash = f2fs_dentry_hash(new_name, NULL);
        make_dentry_ptr_inline(NULL, &d, dentry_blk);
        f2fs_update_dentry(ino, mode, &d, new_name, name_hash, bit_pos);