ocfs2: return non-zero st_blocks for inline data

[karo-tx-linux.git] / fs / f2fs / inline.c

diff --git a/fs/f2fs/inline.c b/fs/f2fs/inline.c
index bda7126466c09f9b16f4d275cac5b287a06c9142..c3f0b7d4cfca174bba6e6b4baa796640b767d2ec 100644 (file)
--- a/fs/f2fs/inline.c
+++ b/fs/f2fs/inline.c
@@ -16,9 +16,6 @@
 
 bool f2fs_may_inline_data(struct inode *inode)
 {
-       if (!test_opt(F2FS_I_SB(inode), INLINE_DATA))
-               return false;
-
        if (f2fs_is_atomic_file(inode))
                return false;
 
@@ -177,6 +174,9 @@ int f2fs_convert_inline_inode(struct inode *inode)
        struct page *ipage, *page;
        int err = 0;
 
+       if (!f2fs_has_inline_data(inode))
+               return 0;
+
        page = grab_cache_page(inode->i_mapping, 0);
        if (!page)
                return -ENOMEM;
@@ -199,6 +199,9 @@ out:
        f2fs_unlock_op(sbi);
 
        f2fs_put_page(page, 1);
+
+       f2fs_balance_fs(sbi, dn.node_changed);
+
        return err;
 }