]> git.karo-electronics.de Git - karo-tx-linux.git/blobdiff - fs/f2fs/file.c
f2fs: support lower priority asynchronous readahead in ra_meta_pages
[karo-tx-linux.git] / fs / f2fs / file.c
index b0f38c3b37f4d5577551e6d517e801a6f644ac09..5d2a2ee35742321026d6defeb6af9b58d3ea39f9 100644 (file)
@@ -27,6 +27,7 @@
 #include "segment.h"
 #include "xattr.h"
 #include "acl.h"
+#include "gc.h"
 #include "trace.h"
 #include <trace/events/f2fs.h>
 
@@ -73,7 +74,8 @@ static int f2fs_vm_page_mkwrite(struct vm_area_struct *vma,
                goto mapped;
 
        /* page is wholly or partially inside EOF */
-       if (((page->index + 1) << PAGE_CACHE_SHIFT) > i_size_read(inode)) {
+       if (((loff_t)(page->index + 1) << PAGE_CACHE_SHIFT) >
+                                               i_size_read(inode)) {
                unsigned offset;
                offset = i_size_read(inode) & ~PAGE_CACHE_MASK;
                zero_user_segment(page, offset, PAGE_CACHE_SIZE);
@@ -85,6 +87,8 @@ static int f2fs_vm_page_mkwrite(struct vm_area_struct *vma,
 mapped:
        /* fill the page */
        f2fs_wait_on_page_writeback(page, DATA);
+       /* if gced page is attached, don't write to cold segment */
+       clear_cold_data(page);
 out:
        sb_end_pagefault(inode->i_sb);
        return block_page_mkwrite_return(err);
@@ -203,8 +207,8 @@ int f2fs_sync_file(struct file *file, loff_t start, loff_t end, int datasync)
        }
 
        /* if the inode is dirty, let's recover all the time */
-       if (!datasync && is_inode_flag_set(fi, FI_DIRTY_INODE)) {
-               update_inode_page(inode);
+       if (!datasync) {
+               f2fs_write_inode(inode, NULL);
                goto go_write;
        }
 
@@ -340,7 +344,7 @@ static loff_t f2fs_seek_block(struct file *file, loff_t offset, int whence)
 
        dirty = __get_first_dirty_index(inode->i_mapping, pgofs, whence);
 
-       for (; data_ofs < isize; data_ofs = pgofs << PAGE_CACHE_SHIFT) {
+       for (; data_ofs < isize; data_ofs = (loff_t)pgofs << PAGE_CACHE_SHIFT) {
                set_new_dnode(&dn, inode, NULL, NULL, 0);
                err = get_dnode_of_data(&dn, pgofs, LOOKUP_NODE_RA);
                if (err && err != -ENOENT) {
@@ -442,9 +446,9 @@ static int f2fs_file_open(struct inode *inode, struct file *filp)
 
 int truncate_data_blocks_range(struct dnode_of_data *dn, int count)
 {
-       int nr_free = 0, ofs = dn->ofs_in_node;
        struct f2fs_sb_info *sbi = F2FS_I_SB(dn->inode);
        struct f2fs_node *raw_node;
+       int nr_free = 0, ofs = dn->ofs_in_node, len = count;
        __le32 *addr;
 
        raw_node = F2FS_NODE(dn->node_page);
@@ -457,14 +461,22 @@ int truncate_data_blocks_range(struct dnode_of_data *dn, int count)
 
                dn->data_blkaddr = NULL_ADDR;
                set_data_blkaddr(dn);
-               f2fs_update_extent_cache(dn);
                invalidate_blocks(sbi, blkaddr);
                if (dn->ofs_in_node == 0 && IS_INODE(dn->node_page))
                        clear_inode_flag(F2FS_I(dn->inode),
                                                FI_FIRST_BLOCK_WRITTEN);
                nr_free++;
        }
+
        if (nr_free) {
+               pgoff_t fofs;
+               /*
+                * once we invalidate valid blkaddr in range [ofs, ofs + count],
+                * we will invalidate all blkaddr in the whole range.
+                */
+               fofs = start_bidx_of_node(ofs_of_node(dn->node_page),
+                                               F2FS_I(dn->inode)) + ofs;
+               f2fs_update_extent_cache_range(dn, fofs, 0, len);
                dec_valid_block_count(sbi, dn->inode, nr_free);
                set_page_dirty(dn->node_page);
                sync_inode_page(dn);
@@ -493,14 +505,14 @@ static int truncate_partial_data_page(struct inode *inode, u64 from,
                return 0;
 
        if (cache_only) {
-               page = grab_cache_page(mapping, index);
+               page = f2fs_grab_cache_page(mapping, index, false);
                if (page && PageUptodate(page))
                        goto truncate_out;
                f2fs_put_page(page, 1);
                return 0;
        }
 
-       page = get_lock_data_page(inode, index);
+       page = get_lock_data_page(inode, index, true);
        if (IS_ERR(page))
                return 0;
 truncate_out:
@@ -576,24 +588,30 @@ out:
        return err;
 }
 
-void f2fs_truncate(struct inode *inode)
+int f2fs_truncate(struct inode *inode, bool lock)
 {
+       int err;
+
        if (!(S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode) ||
                                S_ISLNK(inode->i_mode)))
-               return;
+               return 0;
 
        trace_f2fs_truncate(inode);
 
        /* we should check inline_data size */
        if (f2fs_has_inline_data(inode) && !f2fs_may_inline_data(inode)) {
-               if (f2fs_convert_inline_inode(inode))
-                       return;
+               err = f2fs_convert_inline_inode(inode);
+               if (err)
+                       return err;
        }
 
-       if (!truncate_blocks(inode, i_size_read(inode), true)) {
-               inode->i_mtime = inode->i_ctime = CURRENT_TIME;
-               mark_inode_dirty(inode);
-       }
+       err = truncate_blocks(inode, i_size_read(inode), lock);
+       if (err)
+               return err;
+
+       inode->i_mtime = inode->i_ctime = CURRENT_TIME;
+       mark_inode_dirty(inode);
+       return 0;
 }
 
 int f2fs_getattr(struct vfsmount *mnt,
@@ -653,7 +671,9 @@ int f2fs_setattr(struct dentry *dentry, struct iattr *attr)
 
                if (attr->ia_size <= i_size_read(inode)) {
                        truncate_setsize(inode, attr->ia_size);
-                       f2fs_truncate(inode);
+                       err = f2fs_truncate(inode, true);
+                       if (err)
+                               return err;
                        f2fs_balance_fs(F2FS_I_SB(inode));
                } else {
                        /*
@@ -661,6 +681,7 @@ int f2fs_setattr(struct dentry *dentry, struct iattr *attr)
                         * larger than i_size.
                         */
                        truncate_setsize(inode, attr->ia_size);
+                       inode->i_mtime = inode->i_ctime = CURRENT_TIME;
                }
        }
 
@@ -692,14 +713,14 @@ const struct inode_operations f2fs_file_inode_operations = {
        .fiemap         = f2fs_fiemap,
 };
 
-static void fill_zero(struct inode *inode, pgoff_t index,
+static int fill_zero(struct inode *inode, pgoff_t index,
                                        loff_t start, loff_t len)
 {
        struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
        struct page *page;
 
        if (!len)
-               return;
+               return 0;
 
        f2fs_balance_fs(sbi);
 
@@ -707,33 +728,43 @@ static void fill_zero(struct inode *inode, pgoff_t index,
        page = get_new_data_page(inode, NULL, index, false);
        f2fs_unlock_op(sbi);
 
-       if (!IS_ERR(page)) {
-               f2fs_wait_on_page_writeback(page, DATA);
-               zero_user(page, start, len);
-               set_page_dirty(page);
-               f2fs_put_page(page, 1);
-       }
+       if (IS_ERR(page))
+               return PTR_ERR(page);
+
+       f2fs_wait_on_page_writeback(page, DATA);
+       zero_user(page, start, len);
+       set_page_dirty(page);
+       f2fs_put_page(page, 1);
+       return 0;
 }
 
 int truncate_hole(struct inode *inode, pgoff_t pg_start, pgoff_t pg_end)
 {
-       pgoff_t index;
        int err;
 
-       for (index = pg_start; index < pg_end; index++) {
+       while (pg_start < pg_end) {
                struct dnode_of_data dn;
+               pgoff_t end_offset, count;
 
                set_new_dnode(&dn, inode, NULL, NULL, 0);
-               err = get_dnode_of_data(&dn, index, LOOKUP_NODE);
+               err = get_dnode_of_data(&dn, pg_start, LOOKUP_NODE);
                if (err) {
-                       if (err == -ENOENT)
+                       if (err == -ENOENT) {
+                               pg_start++;
                                continue;
+                       }
                        return err;
                }
 
-               if (dn.data_blkaddr != NULL_ADDR)
-                       truncate_data_blocks_range(&dn, 1);
+               end_offset = ADDRS_PER_PAGE(dn.node_page, F2FS_I(inode));
+               count = min(end_offset - dn.ofs_in_node, pg_end - pg_start);
+
+               f2fs_bug_on(F2FS_I_SB(inode), count == 0 || count > end_offset);
+
+               truncate_data_blocks_range(&dn, count);
                f2fs_put_dnode(&dn);
+
+               pg_start += count;
        }
        return 0;
 }
@@ -744,9 +775,6 @@ static int punch_hole(struct inode *inode, loff_t offset, loff_t len)
        loff_t off_start, off_end;
        int ret = 0;
 
-       if (!S_ISREG(inode->i_mode))
-               return -EOPNOTSUPP;
-
        if (f2fs_has_inline_data(inode)) {
                ret = f2fs_convert_inline_inode(inode);
                if (ret)
@@ -760,14 +788,22 @@ static int punch_hole(struct inode *inode, loff_t offset, loff_t len)
        off_end = (offset + len) & (PAGE_CACHE_SIZE - 1);
 
        if (pg_start == pg_end) {
-               fill_zero(inode, pg_start, off_start,
+               ret = fill_zero(inode, pg_start, off_start,
                                                off_end - off_start);
+               if (ret)
+                       return ret;
        } else {
-               if (off_start)
-                       fill_zero(inode, pg_start++, off_start,
-                                       PAGE_CACHE_SIZE - off_start);
-               if (off_end)
-                       fill_zero(inode, pg_end, 0, off_end);
+               if (off_start) {
+                       ret = fill_zero(inode, pg_start++, off_start,
+                                               PAGE_CACHE_SIZE - off_start);
+                       if (ret)
+                               return ret;
+               }
+               if (off_end) {
+                       ret = fill_zero(inode, pg_end, 0, off_end);
+                       if (ret)
+                               return ret;
+               }
 
                if (pg_start < pg_end) {
                        struct address_space *mapping = inode->i_mapping;
@@ -776,8 +812,8 @@ static int punch_hole(struct inode *inode, loff_t offset, loff_t len)
 
                        f2fs_balance_fs(sbi);
 
-                       blk_start = pg_start << PAGE_CACHE_SHIFT;
-                       blk_end = pg_end << PAGE_CACHE_SHIFT;
+                       blk_start = (loff_t)pg_start << PAGE_CACHE_SHIFT;
+                       blk_end = (loff_t)pg_end << PAGE_CACHE_SHIFT;
                        truncate_inode_pages_range(mapping, blk_start,
                                        blk_end - 1);
 
@@ -790,82 +826,100 @@ static int punch_hole(struct inode *inode, loff_t offset, loff_t len)
        return ret;
 }
 
-static int f2fs_do_collapse(struct inode *inode, pgoff_t start, pgoff_t end)
+static int __exchange_data_block(struct inode *inode, pgoff_t src,
+                                       pgoff_t dst, bool full)
 {
        struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
        struct dnode_of_data dn;
-       pgoff_t nrpages = (i_size_read(inode) + PAGE_SIZE - 1) / PAGE_SIZE;
-       int ret = 0;
-
-       f2fs_lock_op(sbi);
-
-       for (; end < nrpages; start++, end++) {
-               block_t new_addr, old_addr;
+       block_t new_addr;
+       bool do_replace = false;
+       int ret;
 
-               set_new_dnode(&dn, inode, NULL, NULL, 0);
-               ret = get_dnode_of_data(&dn, end, LOOKUP_NODE_RA);
-               if (ret && ret != -ENOENT) {
-                       goto out;
-               } else if (ret == -ENOENT) {
-                       new_addr = NULL_ADDR;
-               } else {
-                       new_addr = dn.data_blkaddr;
-                       truncate_data_blocks_range(&dn, 1);
-                       f2fs_put_dnode(&dn);
+       set_new_dnode(&dn, inode, NULL, NULL, 0);
+       ret = get_dnode_of_data(&dn, src, LOOKUP_NODE_RA);
+       if (ret && ret != -ENOENT) {
+               return ret;
+       } else if (ret == -ENOENT) {
+               new_addr = NULL_ADDR;
+       } else {
+               new_addr = dn.data_blkaddr;
+               if (!is_checkpointed_data(sbi, new_addr)) {
+                       dn.data_blkaddr = NULL_ADDR;
+                       /* do not invalidate this block address */
+                       set_data_blkaddr(&dn);
+                       f2fs_update_extent_cache(&dn);
+                       do_replace = true;
                }
+               f2fs_put_dnode(&dn);
+       }
 
-               if (new_addr == NULL_ADDR) {
-                       set_new_dnode(&dn, inode, NULL, NULL, 0);
-                       ret = get_dnode_of_data(&dn, start, LOOKUP_NODE_RA);
-                       if (ret && ret != -ENOENT)
-                               goto out;
-                       else if (ret == -ENOENT)
-                               continue;
+       if (new_addr == NULL_ADDR)
+               return full ? truncate_hole(inode, dst, dst + 1) : 0;
 
-                       if (dn.data_blkaddr == NULL_ADDR) {
-                               f2fs_put_dnode(&dn);
-                               continue;
-                       } else {
-                               truncate_data_blocks_range(&dn, 1);
-                       }
+       if (do_replace) {
+               struct page *ipage = get_node_page(sbi, inode->i_ino);
+               struct node_info ni;
 
-                       f2fs_put_dnode(&dn);
-               } else {
-                       struct page *ipage;
+               if (IS_ERR(ipage)) {
+                       ret = PTR_ERR(ipage);
+                       goto err_out;
+               }
 
-                       ipage = get_node_page(sbi, inode->i_ino);
-                       if (IS_ERR(ipage)) {
-                               ret = PTR_ERR(ipage);
-                               goto out;
-                       }
+               set_new_dnode(&dn, inode, ipage, NULL, 0);
+               ret = f2fs_reserve_block(&dn, dst);
+               if (ret)
+                       goto err_out;
 
-                       set_new_dnode(&dn, inode, ipage, NULL, 0);
-                       ret = f2fs_reserve_block(&dn, start);
-                       if (ret)
-                               goto out;
+               truncate_data_blocks_range(&dn, 1);
 
-                       old_addr = dn.data_blkaddr;
-                       if (old_addr != NEW_ADDR && new_addr == NEW_ADDR) {
-                               dn.data_blkaddr = NULL_ADDR;
-                               f2fs_update_extent_cache(&dn);
-                               invalidate_blocks(sbi, old_addr);
+               get_node_info(sbi, dn.nid, &ni);
+               f2fs_replace_block(sbi, &dn, dn.data_blkaddr, new_addr,
+                               ni.version, true);
+               f2fs_put_dnode(&dn);
+       } else {
+               struct page *psrc, *pdst;
+
+               psrc = get_lock_data_page(inode, src, true);
+               if (IS_ERR(psrc))
+                       return PTR_ERR(psrc);
+               pdst = get_new_data_page(inode, NULL, dst, false);
+               if (IS_ERR(pdst)) {
+                       f2fs_put_page(psrc, 1);
+                       return PTR_ERR(pdst);
+               }
+               f2fs_copy_page(psrc, pdst);
+               set_page_dirty(pdst);
+               f2fs_put_page(pdst, 1);
+               f2fs_put_page(psrc, 1);
 
-                               dn.data_blkaddr = new_addr;
-                               set_data_blkaddr(&dn);
-                       } else if (new_addr != NEW_ADDR) {
-                               struct node_info ni;
+               return truncate_hole(inode, src, src + 1);
+       }
+       return 0;
 
-                               get_node_info(sbi, dn.nid, &ni);
-                               f2fs_replace_block(sbi, &dn, old_addr, new_addr,
-                                                       ni.version, true);
-                       }
+err_out:
+       if (!get_dnode_of_data(&dn, src, LOOKUP_NODE)) {
+               dn.data_blkaddr = new_addr;
+               set_data_blkaddr(&dn);
+               f2fs_update_extent_cache(&dn);
+               f2fs_put_dnode(&dn);
+       }
+       return ret;
+}
 
-                       f2fs_put_dnode(&dn);
-               }
+static int f2fs_do_collapse(struct inode *inode, pgoff_t start, pgoff_t end)
+{
+       struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
+       pgoff_t nrpages = (i_size_read(inode) + PAGE_SIZE - 1) / PAGE_SIZE;
+       int ret = 0;
+
+       for (; end < nrpages; start++, end++) {
+               f2fs_balance_fs(sbi);
+               f2fs_lock_op(sbi);
+               ret = __exchange_data_block(inode, end, start, true);
+               f2fs_unlock_op(sbi);
+               if (ret)
+                       break;
        }
-       ret = 0;
-out:
-       f2fs_unlock_op(sbi);
        return ret;
 }
 
@@ -875,9 +929,6 @@ static int f2fs_collapse_range(struct inode *inode, loff_t offset, loff_t len)
        loff_t new_size;
        int ret;
 
-       if (!S_ISREG(inode->i_mode))
-               return -EINVAL;
-
        if (offset + len >= i_size_read(inode))
                return -EINVAL;
 
@@ -885,6 +936,14 @@ static int f2fs_collapse_range(struct inode *inode, loff_t offset, loff_t len)
        if (offset & (F2FS_BLKSIZE - 1) || len & (F2FS_BLKSIZE - 1))
                return -EINVAL;
 
+       f2fs_balance_fs(F2FS_I_SB(inode));
+
+       if (f2fs_has_inline_data(inode)) {
+               ret = f2fs_convert_inline_inode(inode);
+               if (ret)
+                       return ret;
+       }
+
        pg_start = offset >> PAGE_CACHE_SHIFT;
        pg_end = (offset + len) >> PAGE_CACHE_SHIFT;
 
@@ -899,7 +958,12 @@ static int f2fs_collapse_range(struct inode *inode, loff_t offset, loff_t len)
        if (ret)
                return ret;
 
+       /* write out all moved pages, if possible */
+       filemap_write_and_wait_range(inode->i_mapping, offset, LLONG_MAX);
+       truncate_pagecache(inode, offset);
+
        new_size = i_size_read(inode) - len;
+       truncate_pagecache(inode, new_size);
 
        ret = truncate_blocks(inode, new_size, true);
        if (!ret)
@@ -918,9 +982,6 @@ static int f2fs_zero_range(struct inode *inode, loff_t offset, loff_t len,
        loff_t off_start, off_end;
        int ret = 0;
 
-       if (!S_ISREG(inode->i_mode))
-               return -EINVAL;
-
        ret = inode_newsize_ok(inode, (len + offset));
        if (ret)
                return ret;
@@ -946,16 +1007,23 @@ static int f2fs_zero_range(struct inode *inode, loff_t offset, loff_t len,
        off_end = (offset + len) & (PAGE_CACHE_SIZE - 1);
 
        if (pg_start == pg_end) {
-               fill_zero(inode, pg_start, off_start, off_end - off_start);
+               ret = fill_zero(inode, pg_start, off_start,
+                                               off_end - off_start);
+               if (ret)
+                       return ret;
+
                if (offset + len > new_size)
                        new_size = offset + len;
                new_size = max_t(loff_t, new_size, offset + len);
        } else {
                if (off_start) {
-                       fill_zero(inode, pg_start++, off_start,
-                                       PAGE_CACHE_SIZE - off_start);
+                       ret = fill_zero(inode, pg_start++, off_start,
+                                               PAGE_CACHE_SIZE - off_start);
+                       if (ret)
+                               return ret;
+
                        new_size = max_t(loff_t, new_size,
-                                               pg_start << PAGE_CACHE_SHIFT);
+                                       (loff_t)pg_start << PAGE_CACHE_SHIFT);
                }
 
                for (index = pg_start; index < pg_end; index++) {
@@ -991,11 +1059,14 @@ static int f2fs_zero_range(struct inode *inode, loff_t offset, loff_t len,
                        f2fs_unlock_op(sbi);
 
                        new_size = max_t(loff_t, new_size,
-                                       (index + 1) << PAGE_CACHE_SHIFT);
+                               (loff_t)(index + 1) << PAGE_CACHE_SHIFT);
                }
 
                if (off_end) {
-                       fill_zero(inode, pg_end, 0, off_end);
+                       ret = fill_zero(inode, pg_end, 0, off_end);
+                       if (ret)
+                               goto out;
+
                        new_size = max_t(loff_t, new_size, offset + len);
                }
        }
@@ -1015,10 +1086,7 @@ static int f2fs_insert_range(struct inode *inode, loff_t offset, loff_t len)
        struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
        pgoff_t pg_start, pg_end, delta, nrpages, idx;
        loff_t new_size;
-       int ret;
-
-       if (!S_ISREG(inode->i_mode))
-               return -EINVAL;
+       int ret = 0;
 
        new_size = i_size_read(inode) + len;
        if (new_size > inode->i_sb->s_maxbytes)
@@ -1033,6 +1101,12 @@ static int f2fs_insert_range(struct inode *inode, loff_t offset, loff_t len)
 
        f2fs_balance_fs(sbi);
 
+       if (f2fs_has_inline_data(inode)) {
+               ret = f2fs_convert_inline_inode(inode);
+               if (ret)
+                       return ret;
+       }
+
        ret = truncate_blocks(inode, i_size_read(inode), true);
        if (ret)
                return ret;
@@ -1050,57 +1124,19 @@ static int f2fs_insert_range(struct inode *inode, loff_t offset, loff_t len)
        nrpages = (i_size_read(inode) + PAGE_SIZE - 1) / PAGE_SIZE;
 
        for (idx = nrpages - 1; idx >= pg_start && idx != -1; idx--) {
-               struct dnode_of_data dn;
-               struct page *ipage;
-               block_t new_addr, old_addr;
-
                f2fs_lock_op(sbi);
-
-               set_new_dnode(&dn, inode, NULL, NULL, 0);
-               ret = get_dnode_of_data(&dn, idx, LOOKUP_NODE_RA);
-               if (ret && ret != -ENOENT) {
-                       goto out;
-               } else if (ret == -ENOENT) {
-                       goto next;
-               } else if (dn.data_blkaddr == NULL_ADDR) {
-                       f2fs_put_dnode(&dn);
-                       goto next;
-               } else {
-                       new_addr = dn.data_blkaddr;
-                       truncate_data_blocks_range(&dn, 1);
-                       f2fs_put_dnode(&dn);
-               }
-
-               ipage = get_node_page(sbi, inode->i_ino);
-               if (IS_ERR(ipage)) {
-                       ret = PTR_ERR(ipage);
-                       goto out;
-               }
-
-               set_new_dnode(&dn, inode, ipage, NULL, 0);
-               ret = f2fs_reserve_block(&dn, idx + delta);
-               if (ret)
-                       goto out;
-
-               old_addr = dn.data_blkaddr;
-               f2fs_bug_on(sbi, old_addr != NEW_ADDR);
-
-               if (new_addr != NEW_ADDR) {
-                       struct node_info ni;
-
-                       get_node_info(sbi, dn.nid, &ni);
-                       f2fs_replace_block(sbi, &dn, old_addr, new_addr,
-                                                       ni.version, true);
-               }
-               f2fs_put_dnode(&dn);
-next:
+               ret = __exchange_data_block(inode, idx, idx + delta, false);
                f2fs_unlock_op(sbi);
+               if (ret)
+                       break;
        }
 
-       i_size_write(inode, new_size);
-       return 0;
-out:
-       f2fs_unlock_op(sbi);
+       /* write out all moved pages, if possible */
+       filemap_write_and_wait_range(inode->i_mapping, offset, LLONG_MAX);
+       truncate_pagecache(inode, offset);
+
+       if (!ret)
+               i_size_write(inode, new_size);
        return ret;
 }
 
@@ -1147,9 +1183,10 @@ noalloc:
                if (pg_start == pg_end)
                        new_size = offset + len;
                else if (index == pg_start && off_start)
-                       new_size = (index + 1) << PAGE_CACHE_SHIFT;
+                       new_size = (loff_t)(index + 1) << PAGE_CACHE_SHIFT;
                else if (index == pg_end)
-                       new_size = (index << PAGE_CACHE_SHIFT) + off_end;
+                       new_size = ((loff_t)index << PAGE_CACHE_SHIFT) +
+                                                               off_end;
                else
                        new_size += PAGE_CACHE_SIZE;
        }
@@ -1171,6 +1208,10 @@ static long f2fs_fallocate(struct file *file, int mode,
        struct inode *inode = file_inode(file);
        long ret = 0;
 
+       /* f2fs only support ->fallocate for regular file */
+       if (!S_ISREG(inode->i_mode))
+               return -EINVAL;
+
        if (f2fs_encrypted_inode(inode) &&
                (mode & (FALLOC_FL_COLLAPSE_RANGE | FALLOC_FL_INSERT_RANGE)))
                return -EOPNOTSUPP;
@@ -1302,6 +1343,7 @@ static int f2fs_ioc_getversion(struct file *filp, unsigned long arg)
 static int f2fs_ioc_start_atomic_write(struct file *filp)
 {
        struct inode *inode = file_inode(filp);
+       int ret;
 
        if (!inode_owner_or_capable(inode))
                return -EACCES;
@@ -1311,9 +1353,12 @@ static int f2fs_ioc_start_atomic_write(struct file *filp)
        if (f2fs_is_atomic_file(inode))
                return 0;
 
-       set_inode_flag(F2FS_I(inode), FI_ATOMIC_FILE);
+       ret = f2fs_convert_inline_inode(inode);
+       if (ret)
+               return ret;
 
-       return f2fs_convert_inline_inode(inode);
+       set_inode_flag(F2FS_I(inode), FI_ATOMIC_FILE);
+       return 0;
 }
 
 static int f2fs_ioc_commit_atomic_write(struct file *filp)
@@ -1333,10 +1378,13 @@ static int f2fs_ioc_commit_atomic_write(struct file *filp)
 
        if (f2fs_is_atomic_file(inode)) {
                clear_inode_flag(F2FS_I(inode), FI_ATOMIC_FILE);
-               commit_inmem_pages(inode, false);
+               ret = commit_inmem_pages(inode, false);
+               if (ret)
+                       goto err_out;
        }
 
-       ret = f2fs_sync_file(filp, 0, LONG_MAX, 0);
+       ret = f2fs_sync_file(filp, 0, LLONG_MAX, 0);
+err_out:
        mnt_drop_write_file(filp);
        return ret;
 }
@@ -1344,6 +1392,7 @@ static int f2fs_ioc_commit_atomic_write(struct file *filp)
 static int f2fs_ioc_start_volatile_write(struct file *filp)
 {
        struct inode *inode = file_inode(filp);
+       int ret;
 
        if (!inode_owner_or_capable(inode))
                return -EACCES;
@@ -1351,9 +1400,12 @@ static int f2fs_ioc_start_volatile_write(struct file *filp)
        if (f2fs_is_volatile_file(inode))
                return 0;
 
-       set_inode_flag(F2FS_I(inode), FI_VOLATILE_FILE);
+       ret = f2fs_convert_inline_inode(inode);
+       if (ret)
+               return ret;
 
-       return f2fs_convert_inline_inode(inode);
+       set_inode_flag(F2FS_I(inode), FI_VOLATILE_FILE);
+       return 0;
 }
 
 static int f2fs_ioc_release_volatile_write(struct file *filp)
@@ -1369,8 +1421,7 @@ static int f2fs_ioc_release_volatile_write(struct file *filp)
        if (!f2fs_is_first_block_written(inode))
                return truncate_partial_data_page(inode, 0, true);
 
-       punch_hole(inode, 0, F2FS_BLKSIZE);
-       return 0;
+       return punch_hole(inode, 0, F2FS_BLKSIZE);
 }
 
 static int f2fs_ioc_abort_volatile_write(struct file *filp)
@@ -1389,7 +1440,7 @@ static int f2fs_ioc_abort_volatile_write(struct file *filp)
 
        if (f2fs_is_atomic_file(inode)) {
                clear_inode_flag(F2FS_I(inode), FI_ATOMIC_FILE);
-               commit_inmem_pages(inode, false);
+               commit_inmem_pages(inode, true);
        }
 
        if (f2fs_is_volatile_file(inode))
@@ -1428,6 +1479,10 @@ static int f2fs_ioc_shutdown(struct file *filp, unsigned long arg)
        case F2FS_GOING_DOWN_NOSYNC:
                f2fs_stop_checkpoint(sbi);
                break;
+       case F2FS_GOING_DOWN_METAFLUSH:
+               sync_meta_pages(sbi, META, LONG_MAX);
+               f2fs_stop_checkpoint(sbi);
+               break;
        default:
                return -EINVAL;
        }
@@ -1544,6 +1599,52 @@ got_it:
        return 0;
 }
 
+static int f2fs_ioc_gc(struct file *filp, unsigned long arg)
+{
+       struct inode *inode = file_inode(filp);
+       struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
+       __u32 sync;
+
+       if (!capable(CAP_SYS_ADMIN))
+               return -EPERM;
+
+       if (get_user(sync, (__u32 __user *)arg))
+               return -EFAULT;
+
+       if (f2fs_readonly(sbi->sb))
+               return -EROFS;
+
+       if (!sync) {
+               if (!mutex_trylock(&sbi->gc_mutex))
+                       return -EBUSY;
+       } else {
+               mutex_lock(&sbi->gc_mutex);
+       }
+
+       return f2fs_gc(sbi, sync);
+}
+
+static int f2fs_ioc_write_checkpoint(struct file *filp, unsigned long arg)
+{
+       struct inode *inode = file_inode(filp);
+       struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
+       struct cp_control cpc;
+
+       if (!capable(CAP_SYS_ADMIN))
+               return -EPERM;
+
+       if (f2fs_readonly(sbi->sb))
+               return -EROFS;
+
+       cpc.reason = __get_cp_reason(sbi);
+
+       mutex_lock(&sbi->gc_mutex);
+       write_checkpoint(sbi, &cpc);
+       mutex_unlock(&sbi->gc_mutex);
+
+       return 0;
+}
+
 long f2fs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
 {
        switch (cmd) {
@@ -1573,6 +1674,10 @@ long f2fs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
                return f2fs_ioc_get_encryption_policy(filp, arg);
        case F2FS_IOC_GET_ENCRYPTION_PWSALT:
                return f2fs_ioc_get_encryption_pwsalt(filp, arg);
+       case F2FS_IOC_GARBAGE_COLLECT:
+               return f2fs_ioc_gc(filp, arg);
+       case F2FS_IOC_WRITE_CHECKPOINT:
+               return f2fs_ioc_write_checkpoint(filp, arg);
        default:
                return -ENOTTY;
        }