Merge tag 'vfio-v4.2-rc1' of git://github.com/awilliam/linux-vfio

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

diff --git a/fs/f2fs/inline.c b/fs/f2fs/inline.c
index 8140e4f..38e75fb 100644 (file)
--- a/fs/f2fs/inline.c
+++ b/fs/f2fs/inline.c
@@ -13,7 +13,7 @@
 
 #include "f2fs.h"
 
-bool f2fs_may_inline(struct inode *inode)
+bool f2fs_may_inline_data(struct inode *inode)
 {
        if (!test_opt(F2FS_I_SB(inode), INLINE_DATA))
                return false;
@@ -27,6 +27,20 @@ bool f2fs_may_inline(struct inode *inode)
        if (i_size_read(inode) > MAX_INLINE_DATA)
                return false;
 
+       if (f2fs_encrypted_inode(inode) && S_ISREG(inode->i_mode))
+               return false;
+
+       return true;
+}
+
+bool f2fs_may_inline_dentry(struct inode *inode)
+{
+       if (!test_opt(F2FS_I_SB(inode), INLINE_DENTRY))
+               return false;
+
+       if (!S_ISDIR(inode->i_mode))
+               return false;
+
        return true;
 }
 
@@ -95,8 +109,11 @@ int f2fs_convert_inline_page(struct dnode_of_data *dn, struct page *page)
 {
        void *src_addr, *dst_addr;
        struct f2fs_io_info fio = {
+               .sbi = F2FS_I_SB(dn->inode),
                .type = DATA,
                .rw = WRITE_SYNC | REQ_PRIO,
+               .page = page,
+               .encrypted_page = NULL,
        };
        int dirty, err;
 
@@ -130,7 +147,7 @@ no_update:
        /* write data page to try to make data consistent */
        set_page_writeback(page);
        fio.blk_addr = dn->data_blkaddr;
-       write_data_page(page, dn, &fio);
+       write_data_page(dn, &fio);
        set_data_blkaddr(dn);
        f2fs_update_extent_cache(dn);
        f2fs_wait_on_page_writeback(page, DATA);
@@ -267,23 +284,26 @@ process_inline:
 }
 
 struct f2fs_dir_entry *find_in_inline_dir(struct inode *dir,
-                               struct qstr *name, struct page **res_page)
+                       struct f2fs_filename *fname, struct page **res_page)
 {
        struct f2fs_sb_info *sbi = F2FS_SB(dir->i_sb);
        struct f2fs_inline_dentry *inline_dentry;
+       struct qstr name = FSTR_TO_QSTR(&fname->disk_name);
        struct f2fs_dir_entry *de;
        struct f2fs_dentry_ptr d;
        struct page *ipage;
+       f2fs_hash_t namehash;
 
        ipage = get_node_page(sbi, dir->i_ino);
        if (IS_ERR(ipage))
                return NULL;
 
-       inline_dentry = inline_data_addr(ipage);
+       namehash = f2fs_dentry_hash(&name);
 
-       make_dentry_ptr(&d, (void *)inline_dentry, 2);
-       de = find_target_dentry(name, NULL, &d);
+       inline_dentry = inline_data_addr(ipage);
 
+       make_dentry_ptr(NULL, &d, (void *)inline_dentry, 2);
+       de = find_target_dentry(fname, namehash, NULL, &d);
        unlock_page(ipage);
        if (de)
                *res_page = ipage;
@@ -325,7 +345,7 @@ int make_empty_inline_dir(struct inode *inode, struct inode *parent,
 
        dentry_blk = inline_data_addr(ipage);
 
-       make_dentry_ptr(&d, (void *)dentry_blk, 2);
+       make_dentry_ptr(NULL, &d, (void *)dentry_blk, 2);
        do_make_empty_dir(inode, parent, &d);
 
        set_page_dirty(ipage);
@@ -429,7 +449,7 @@ int f2fs_add_inline_entry(struct inode *dir, const struct qstr *name,
        f2fs_wait_on_page_writeback(ipage, NODE);
 
        name_hash = f2fs_dentry_hash(name);
-       make_dentry_ptr(&d, (void *)dentry_blk, 2);
+       make_dentry_ptr(NULL, &d, (void *)dentry_blk, 2);
        f2fs_update_dentry(ino, mode, &d, name, name_hash, bit_pos);
 
        set_page_dirty(ipage);
@@ -506,7 +526,8 @@ bool f2fs_empty_inline_dir(struct inode *dir)
        return true;
 }
 
-int f2fs_read_inline_dir(struct file *file, struct dir_context *ctx)
+int f2fs_read_inline_dir(struct file *file, struct dir_context *ctx,
+                               struct f2fs_str *fstr)
 {
        struct inode *inode = file_inode(file);
        struct f2fs_inline_dentry *inline_dentry = NULL;
@@ -522,9 +543,9 @@ int f2fs_read_inline_dir(struct file *file, struct dir_context *ctx)
 
        inline_dentry = inline_data_addr(ipage);
 
-       make_dentry_ptr(&d, (void *)inline_dentry, 2);
+       make_dentry_ptr(inode, &d, (void *)inline_dentry, 2);
 
-       if (!f2fs_fill_dentries(ctx, &d, 0))
+       if (!f2fs_fill_dentries(ctx, &d, 0, fstr))
                ctx->pos = NR_INLINE_DENTRY;
 
        f2fs_put_page(ipage, 1);