smb3: Add defines for new information level, FileIdInformation

[tomoyo/tomoyo-test1.git] / fs / f2fs / inline.c

diff --git a/fs/f2fs/inline.c b/fs/f2fs/inline.c
index 896db04..4167e54 100644 (file)
--- a/fs/f2fs/inline.c
+++ b/fs/f2fs/inline.c
@@ -368,7 +368,7 @@ static int f2fs_move_inline_dirents(struct inode *dir, struct page *ipage,
        struct f2fs_dentry_ptr src, dst;
        int err;
 
-       page = f2fs_grab_cache_page(dir->i_mapping, 0, false);
+       page = f2fs_grab_cache_page(dir->i_mapping, 0, true);
        if (!page) {
                f2fs_put_page(ipage, 1);
                return -ENOMEM;
@@ -530,7 +530,7 @@ recover:
        return err;
 }
 
-static int f2fs_convert_inline_dir(struct inode *dir, struct page *ipage,
+static int do_convert_inline_dir(struct inode *dir, struct page *ipage,
                                                        void *inline_dentry)
 {
        if (!F2FS_I(dir)->i_dir_level)
@@ -539,6 +539,44 @@ static int f2fs_convert_inline_dir(struct inode *dir, struct page *ipage,
                return f2fs_move_rehashed_dirents(dir, ipage, inline_dentry);
 }
 
+int f2fs_try_convert_inline_dir(struct inode *dir, struct dentry *dentry)
+{
+       struct f2fs_sb_info *sbi = F2FS_I_SB(dir);
+       struct page *ipage;
+       struct fscrypt_name fname;
+       void *inline_dentry = NULL;
+       int err = 0;
+
+       if (!f2fs_has_inline_dentry(dir))
+               return 0;
+
+       f2fs_lock_op(sbi);
+
+       err = fscrypt_setup_filename(dir, &dentry->d_name, 0, &fname);
+       if (err)
+               goto out;
+
+       ipage = f2fs_get_node_page(sbi, dir->i_ino);
+       if (IS_ERR(ipage)) {
+               err = PTR_ERR(ipage);
+               goto out;
+       }
+
+       if (f2fs_has_enough_room(dir, ipage, &fname)) {
+               f2fs_put_page(ipage, 1);
+               goto out;
+       }
+
+       inline_dentry = inline_data_addr(dir, ipage);
+
+       err = do_convert_inline_dir(dir, ipage, inline_dentry);
+       if (!err)
+               f2fs_put_page(ipage, 1);
+out:
+       f2fs_unlock_op(sbi);
+       return err;
+}
+
 int f2fs_add_inline_entry(struct inode *dir, const struct qstr *new_name,
                                const struct qstr *orig_name,
                                struct inode *inode, nid_t ino, umode_t mode)
@@ -562,7 +600,7 @@ int f2fs_add_inline_entry(struct inode *dir, const struct qstr *new_name,
 
        bit_pos = f2fs_room_for_filename(d.bitmap, slots, d.max);
        if (bit_pos >= d.max) {
-               err = f2fs_convert_inline_dir(dir, ipage, inline_dentry);
+               err = do_convert_inline_dir(dir, ipage, inline_dentry);
                if (err)
                        return err;
                err = -EAGAIN;