]> git.karo-electronics.de Git - karo-tx-linux.git/blobdiff - fs/f2fs/data.c
f2fs: avoid f2fs_balance_fs call during pageout
[karo-tx-linux.git] / fs / f2fs / data.c
index 2ce5a9ef508b2630fd79b3fe72416fa2f02d2e76..e57bde02e37f662fc37253a82d07617d41fd6e7a 100644 (file)
 #include "segment.h"
 #include <trace/events/f2fs.h>
 
-/*
- * Low-level block read/write IO operations.
- */
-static struct bio *__bio_alloc(struct block_device *bdev, int npages)
-{
-       struct bio *bio;
-
-       /* No failure on bio allocation */
-       bio = bio_alloc(GFP_NOIO, npages);
-       bio->bi_bdev = bdev;
-       bio->bi_private = NULL;
-       return bio;
-}
-
 static void f2fs_read_end_io(struct bio *bio, int err)
 {
        const int uptodate = test_bit(BIO_UPTODATE, &bio->bi_flags);
@@ -49,11 +35,11 @@ static void f2fs_read_end_io(struct bio *bio, int err)
                if (--bvec >= bio->bi_io_vec)
                        prefetchw(&bvec->bv_page->flags);
 
-               if (uptodate) {
-                       SetPageUptodate(page);
-               } else {
+               if (unlikely(!uptodate)) {
                        ClearPageUptodate(page);
                        SetPageError(page);
+               } else {
+                       SetPageUptodate(page);
                }
                unlock_page(page);
        } while (bvec >= bio->bi_io_vec);
@@ -73,7 +59,7 @@ static void f2fs_write_end_io(struct bio *bio, int err)
                if (--bvec >= bio->bi_io_vec)
                        prefetchw(&bvec->bv_page->flags);
 
-               if (!uptodate) {
+               if (unlikely(!uptodate)) {
                        SetPageError(page);
                        set_bit(AS_EIO, &page->mapping->flags);
                        set_ckpt_flags(sbi->ckpt, CP_ERROR_FLAG);
@@ -93,50 +79,60 @@ static void f2fs_write_end_io(struct bio *bio, int err)
        bio_put(bio);
 }
 
-static void __submit_merged_bio(struct f2fs_sb_info *sbi,
-                               struct f2fs_bio_info *io,
-                               enum page_type type, bool sync, int rw)
+/*
+ * Low-level block read/write IO operations.
+ */
+static struct bio *__bio_alloc(struct f2fs_sb_info *sbi, block_t blk_addr,
+                               int npages, bool is_read)
 {
-       enum page_type btype = PAGE_TYPE_OF_BIO(type);
+       struct bio *bio;
 
-       if (!io->bio)
-               return;
+       /* No failure on bio allocation */
+       bio = bio_alloc(GFP_NOIO, npages);
 
-       if (btype == META)
-               rw |= REQ_META;
+       bio->bi_bdev = sbi->sb->s_bdev;
+       bio->bi_sector = SECTOR_FROM_BLOCK(sbi, blk_addr);
+       bio->bi_end_io = is_read ? f2fs_read_end_io : f2fs_write_end_io;
 
-       if (is_read_io(rw)) {
-               if (sync)
-                       rw |= READ_SYNC;
-               submit_bio(rw, io->bio);
-               trace_f2fs_submit_read_bio(sbi->sb, rw, type, io->bio);
-               io->bio = NULL;
+       return bio;
+}
+
+static void __submit_merged_bio(struct f2fs_bio_info *io)
+{
+       struct f2fs_io_info *fio = &io->fio;
+       int rw;
+
+       if (!io->bio)
                return;
-       }
 
-       if (sync)
-               rw |= WRITE_SYNC;
-       if (type >= META_FLUSH)
-               rw |= WRITE_FLUSH_FUA;
+       rw = fio->rw;
 
-       /*
-        * META_FLUSH is only from the checkpoint procedure, and we should wait
-        * this metadata bio for FS consistency.
-        */
-       if (type == META_FLUSH) {
-               DECLARE_COMPLETION_ONSTACK(wait);
-               io->bio->bi_private = &wait;
+       if (is_read_io(rw)) {
+               trace_f2fs_submit_read_bio(io->sbi->sb, rw,
+                                               fio->type, io->bio);
                submit_bio(rw, io->bio);
-               wait_for_completion(&wait);
        } else {
-               submit_bio(rw, io->bio);
+               trace_f2fs_submit_write_bio(io->sbi->sb, rw,
+                                               fio->type, io->bio);
+               /*
+                * META_FLUSH is only from the checkpoint procedure, and we
+                * should wait this metadata bio for FS consistency.
+                */
+               if (fio->type == META_FLUSH) {
+                       DECLARE_COMPLETION_ONSTACK(wait);
+                       io->bio->bi_private = &wait;
+                       submit_bio(rw, io->bio);
+                       wait_for_completion(&wait);
+               } else {
+                       submit_bio(rw, io->bio);
+               }
        }
-       trace_f2fs_submit_write_bio(sbi->sb, rw, btype, io->bio);
+
        io->bio = NULL;
 }
 
 void f2fs_submit_merged_bio(struct f2fs_sb_info *sbi,
-                               enum page_type type, bool sync, int rw)
+                               enum page_type type, int rw)
 {
        enum page_type btype = PAGE_TYPE_OF_BIO(type);
        struct f2fs_bio_info *io;
@@ -144,7 +140,13 @@ void f2fs_submit_merged_bio(struct f2fs_sb_info *sbi,
        io = is_read_io(rw) ? &sbi->read_io : &sbi->write_io[btype];
 
        mutex_lock(&io->io_mutex);
-       __submit_merged_bio(sbi, io, type, sync, rw);
+
+       /* change META to META_FLUSH in the checkpoint procedure */
+       if (type >= META_FLUSH) {
+               io->fio.type = META_FLUSH;
+               io->fio.rw = WRITE_FLUSH_FUA;
+       }
+       __submit_merged_bio(io);
        mutex_unlock(&io->io_mutex);
 }
 
@@ -155,17 +157,12 @@ void f2fs_submit_merged_bio(struct f2fs_sb_info *sbi,
 int f2fs_submit_page_bio(struct f2fs_sb_info *sbi, struct page *page,
                                        block_t blk_addr, int rw)
 {
-       struct block_device *bdev = sbi->sb->s_bdev;
        struct bio *bio;
 
        trace_f2fs_submit_page_bio(page, blk_addr, rw);
 
        /* Allocate a new bio */
-       bio = __bio_alloc(bdev, 1);
-
-       /* Initialize the bio */
-       bio->bi_sector = SECTOR_FROM_BLOCK(sbi, blk_addr);
-       bio->bi_end_io = is_read_io(rw) ? f2fs_read_end_io : f2fs_write_end_io;
+       bio = __bio_alloc(sbi, blk_addr, 1, is_read_io(rw));
 
        if (bio_add_page(bio, page, PAGE_CACHE_SIZE, 0) < PAGE_CACHE_SIZE) {
                bio_put(bio);
@@ -178,48 +175,42 @@ int f2fs_submit_page_bio(struct f2fs_sb_info *sbi, struct page *page,
 }
 
 void f2fs_submit_page_mbio(struct f2fs_sb_info *sbi, struct page *page,
-                       block_t blk_addr, enum page_type type, int rw)
+                       block_t blk_addr, struct f2fs_io_info *fio)
 {
-       enum page_type btype = PAGE_TYPE_OF_BIO(type);
-       struct block_device *bdev = sbi->sb->s_bdev;
+       enum page_type btype = PAGE_TYPE_OF_BIO(fio->type);
        struct f2fs_bio_info *io;
-       int bio_blocks;
+       bool is_read = is_read_io(fio->rw);
 
-       io = is_read_io(rw) ? &sbi->read_io : &sbi->write_io[btype];
+       io = is_read ? &sbi->read_io : &sbi->write_io[btype];
 
        verify_block_addr(sbi, blk_addr);
 
        mutex_lock(&io->io_mutex);
 
-       if (!is_read_io(rw))
+       if (!is_read)
                inc_page_count(sbi, F2FS_WRITEBACK);
 
-       if (io->bio && io->last_block_in_bio != blk_addr - 1)
-               __submit_merged_bio(sbi, io, type, true, rw);
+       if (io->bio && (io->last_block_in_bio != blk_addr - 1 ||
+                                               io->fio.rw != fio->rw))
+               __submit_merged_bio(io);
 alloc_new:
        if (io->bio == NULL) {
-               bio_blocks = MAX_BIO_BLOCKS(max_hw_blocks(sbi));
-               io->bio = __bio_alloc(bdev, bio_blocks);
-               io->bio->bi_sector = SECTOR_FROM_BLOCK(sbi, blk_addr);
-               io->bio->bi_end_io = is_read_io(rw) ? f2fs_read_end_io :
-                                                       f2fs_write_end_io;
-               /*
-                * The end_io will be assigned at the sumbission phase.
-                * Until then, let bio_add_page() merge consecutive IOs as much
-                * as possible.
-                */
+               int bio_blocks = MAX_BIO_BLOCKS(max_hw_blocks(sbi));
+
+               io->bio = __bio_alloc(sbi, blk_addr, bio_blocks, is_read);
+               io->fio = *fio;
        }
 
        if (bio_add_page(io->bio, page, PAGE_CACHE_SIZE, 0) <
                                                        PAGE_CACHE_SIZE) {
-               __submit_merged_bio(sbi, io, type, true, rw);
+               __submit_merged_bio(io);
                goto alloc_new;
        }
 
        io->last_block_in_bio = blk_addr;
 
        mutex_unlock(&io->io_mutex);
-       trace_f2fs_submit_page_mbio(page, rw, type, blk_addr);
+       trace_f2fs_submit_page_mbio(page, fio->rw, fio->type, blk_addr);
 }
 
 /*
@@ -235,7 +226,7 @@ static void __set_data_blkaddr(struct dnode_of_data *dn, block_t new_addr)
        struct page *node_page = dn->node_page;
        unsigned int ofs_in_node = dn->ofs_in_node;
 
-       f2fs_wait_on_page_writeback(node_page, NODE, false);
+       f2fs_wait_on_page_writeback(node_page, NODE);
 
        rn = F2FS_NODE(node_page);
 
@@ -249,7 +240,7 @@ int reserve_new_block(struct dnode_of_data *dn)
 {
        struct f2fs_sb_info *sbi = F2FS_SB(dn->inode->i_sb);
 
-       if (is_inode_flag_set(F2FS_I(dn->inode), FI_NO_ALLOC))
+       if (unlikely(is_inode_flag_set(F2FS_I(dn->inode), FI_NO_ALLOC)))
                return -EPERM;
        if (unlikely(!inc_valid_block_count(sbi, dn->inode, 1)))
                return -ENOSPC;
@@ -267,13 +258,16 @@ int f2fs_reserve_block(struct dnode_of_data *dn, pgoff_t index)
        bool need_put = dn->inode_page ? false : true;
        int err;
 
+       /* if inode_page exists, index should be zero */
+       f2fs_bug_on(!need_put && index);
+
        err = get_dnode_of_data(dn, index, ALLOC_NODE);
        if (err)
                return err;
+
        if (dn->data_blkaddr == NULL_ADDR)
                err = reserve_new_block(dn);
-
-       if (need_put)
+       if (err || need_put)
                f2fs_put_dnode(dn);
        return err;
 }
@@ -424,7 +418,7 @@ struct page *find_data_page(struct inode *inode, pgoff_t index, bool sync)
                return ERR_PTR(-ENOENT);
 
        /* By fallocate(), there is no cached page, but with NEW_ADDR */
-       if (dn.data_blkaddr == NEW_ADDR)
+       if (unlikely(dn.data_blkaddr == NEW_ADDR))
                return ERR_PTR(-EINVAL);
 
        page = grab_cache_page_write_begin(mapping, index, AOP_FLAG_NOFS);
@@ -443,7 +437,7 @@ struct page *find_data_page(struct inode *inode, pgoff_t index, bool sync)
 
        if (sync) {
                wait_on_page_locked(page);
-               if (!PageUptodate(page)) {
+               if (unlikely(!PageUptodate(page))) {
                        f2fs_put_page(page, 0);
                        return ERR_PTR(-EIO);
                }
@@ -477,7 +471,7 @@ repeat:
        }
        f2fs_put_dnode(&dn);
 
-       if (dn.data_blkaddr == NULL_ADDR) {
+       if (unlikely(dn.data_blkaddr == NULL_ADDR)) {
                f2fs_put_page(page, 1);
                return ERR_PTR(-ENOENT);
        }
@@ -502,11 +496,11 @@ repeat:
                return ERR_PTR(err);
 
        lock_page(page);
-       if (!PageUptodate(page)) {
+       if (unlikely(!PageUptodate(page))) {
                f2fs_put_page(page, 1);
                return ERR_PTR(-EIO);
        }
-       if (page->mapping != mapping) {
+       if (unlikely(page->mapping != mapping)) {
                f2fs_put_page(page, 1);
                goto repeat;
        }
@@ -517,12 +511,12 @@ repeat:
  * Caller ensures that this data page is never allocated.
  * A new zero-filled data page is allocated in the page cache.
  *
- * Also, caller should grab and release a mutex by calling mutex_lock_op() and
- * mutex_unlock_op().
- * Note that, npage is set only by make_empty_dir.
+ * Also, caller should grab and release a rwsem by calling f2fs_lock_op() and
+ * f2fs_unlock_op().
+ * Note that, ipage is set only by make_empty_dir.
  */
 struct page *get_new_data_page(struct inode *inode,
-               struct page *npage, pgoff_t index, bool new_i_size)
+               struct page *ipage, pgoff_t index, bool new_i_size)
 {
        struct f2fs_sb_info *sbi = F2FS_SB(inode->i_sb);
        struct address_space *mapping = inode->i_mapping;
@@ -530,15 +524,16 @@ struct page *get_new_data_page(struct inode *inode,
        struct dnode_of_data dn;
        int err;
 
-       set_new_dnode(&dn, inode, npage, npage, 0);
+       set_new_dnode(&dn, inode, ipage, NULL, 0);
        err = f2fs_reserve_block(&dn, index);
        if (err)
                return ERR_PTR(err);
-
 repeat:
        page = grab_cache_page(mapping, index);
-       if (!page)
-               return ERR_PTR(-ENOMEM);
+       if (!page) {
+               err = -ENOMEM;
+               goto put_err;
+       }
 
        if (PageUptodate(page))
                return page;
@@ -550,13 +545,15 @@ repeat:
                err = f2fs_submit_page_bio(sbi, page, dn.data_blkaddr,
                                                                READ_SYNC);
                if (err)
-                       return ERR_PTR(err);
+                       goto put_err;
+
                lock_page(page);
-               if (!PageUptodate(page)) {
+               if (unlikely(!PageUptodate(page))) {
                        f2fs_put_page(page, 1);
-                       return ERR_PTR(-EIO);
+                       err = -EIO;
+                       goto put_err;
                }
-               if (page->mapping != mapping) {
+               if (unlikely(page->mapping != mapping)) {
                        f2fs_put_page(page, 1);
                        goto repeat;
                }
@@ -570,82 +567,185 @@ repeat:
                mark_inode_dirty_sync(inode);
        }
        return page;
+
+put_err:
+       f2fs_put_dnode(&dn);
+       return ERR_PTR(err);
+}
+
+static int __allocate_data_block(struct dnode_of_data *dn)
+{
+       struct f2fs_sb_info *sbi = F2FS_SB(dn->inode->i_sb);
+       struct f2fs_summary sum;
+       block_t new_blkaddr;
+       struct node_info ni;
+       int type;
+
+       if (unlikely(is_inode_flag_set(F2FS_I(dn->inode), FI_NO_ALLOC)))
+               return -EPERM;
+       if (unlikely(!inc_valid_block_count(sbi, dn->inode, 1)))
+               return -ENOSPC;
+
+       __set_data_blkaddr(dn, NEW_ADDR);
+       dn->data_blkaddr = NEW_ADDR;
+
+       get_node_info(sbi, dn->nid, &ni);
+       set_summary(&sum, dn->nid, dn->ofs_in_node, ni.version);
+
+       type = CURSEG_WARM_DATA;
+
+       allocate_data_block(sbi, NULL, NULL_ADDR, &new_blkaddr, &sum, type);
+
+       /* direct IO doesn't use extent cache to maximize the performance */
+       set_inode_flag(F2FS_I(dn->inode), FI_NO_EXTENT);
+       update_extent_cache(new_blkaddr, dn);
+       clear_inode_flag(F2FS_I(dn->inode), FI_NO_EXTENT);
+
+       dn->data_blkaddr = new_blkaddr;
+       return 0;
 }
 
 /*
- * This function should be used by the data read flow only where it
- * does not check the "create" flag that indicates block allocation.
- * The reason for this special functionality is to exploit VFS readahead
- * mechanism.
+ * get_data_block() now supported readahead/bmap/rw direct_IO with mapped bh.
+ * If original data blocks are allocated, then give them to blockdev.
+ * Otherwise,
+ *     a. preallocate requested block addresses
+ *     b. do not use extent cache for better performance
+ *     c. give the block addresses to blockdev
  */
-static int get_data_block_ro(struct inode *inode, sector_t iblock,
+static int get_data_block(struct inode *inode, sector_t iblock,
                        struct buffer_head *bh_result, int create)
 {
+       struct f2fs_sb_info *sbi = F2FS_SB(inode->i_sb);
        unsigned int blkbits = inode->i_sb->s_blocksize_bits;
        unsigned maxblocks = bh_result->b_size >> blkbits;
        struct dnode_of_data dn;
-       pgoff_t pgofs;
-       int err;
+       int mode = create ? ALLOC_NODE : LOOKUP_NODE_RA;
+       pgoff_t pgofs, end_offset;
+       int err = 0, ofs = 1;
+       bool allocated = false;
 
        /* Get the page offset from the block offset(iblock) */
        pgofs = (pgoff_t)(iblock >> (PAGE_CACHE_SHIFT - blkbits));
 
-       if (check_extent_cache(inode, pgofs, bh_result)) {
-               trace_f2fs_get_data_block(inode, iblock, bh_result, 0);
-               return 0;
-       }
+       if (check_extent_cache(inode, pgofs, bh_result))
+               goto out;
+
+       if (create)
+               f2fs_lock_op(sbi);
 
        /* When reading holes, we need its node page */
        set_new_dnode(&dn, inode, NULL, NULL, 0);
-       err = get_dnode_of_data(&dn, pgofs, LOOKUP_NODE_RA);
+       err = get_dnode_of_data(&dn, pgofs, mode);
        if (err) {
-               trace_f2fs_get_data_block(inode, iblock, bh_result, err);
-               return (err == -ENOENT) ? 0 : err;
+               if (err == -ENOENT)
+                       err = 0;
+               goto unlock_out;
        }
+       if (dn.data_blkaddr == NEW_ADDR)
+               goto put_out;
 
-       /* It does not support data allocation */
-       f2fs_bug_on(create);
+       if (dn.data_blkaddr != NULL_ADDR) {
+               map_bh(bh_result, inode->i_sb, dn.data_blkaddr);
+       } else if (create) {
+               err = __allocate_data_block(&dn);
+               if (err)
+                       goto put_out;
+               allocated = true;
+               map_bh(bh_result, inode->i_sb, dn.data_blkaddr);
+       } else {
+               goto put_out;
+       }
 
-       if (dn.data_blkaddr != NEW_ADDR && dn.data_blkaddr != NULL_ADDR) {
-               int i;
-               unsigned int end_offset;
+       end_offset = IS_INODE(dn.node_page) ?
+                       ADDRS_PER_INODE(F2FS_I(inode)) : ADDRS_PER_BLOCK;
+       bh_result->b_size = (((size_t)1) << blkbits);
+       dn.ofs_in_node++;
+       pgofs++;
+
+get_next:
+       if (dn.ofs_in_node >= end_offset) {
+               if (allocated)
+                       sync_inode_page(&dn);
+               allocated = false;
+               f2fs_put_dnode(&dn);
+
+               set_new_dnode(&dn, inode, NULL, NULL, 0);
+               err = get_dnode_of_data(&dn, pgofs, mode);
+               if (err) {
+                       if (err == -ENOENT)
+                               err = 0;
+                       goto unlock_out;
+               }
+               if (dn.data_blkaddr == NEW_ADDR)
+                       goto put_out;
 
                end_offset = IS_INODE(dn.node_page) ?
-                               ADDRS_PER_INODE(F2FS_I(inode)) :
-                               ADDRS_PER_BLOCK;
-
-               clear_buffer_new(bh_result);
+                       ADDRS_PER_INODE(F2FS_I(inode)) : ADDRS_PER_BLOCK;
+       }
 
+       if (maxblocks > (bh_result->b_size >> blkbits)) {
+               block_t blkaddr = datablock_addr(dn.node_page, dn.ofs_in_node);
+               if (blkaddr == NULL_ADDR && create) {
+                       err = __allocate_data_block(&dn);
+                       if (err)
+                               goto sync_out;
+                       allocated = true;
+                       blkaddr = dn.data_blkaddr;
+               }
                /* Give more consecutive addresses for the read ahead */
-               for (i = 0; i < end_offset - dn.ofs_in_node; i++)
-                       if (((datablock_addr(dn.node_page,
-                                                       dn.ofs_in_node + i))
-                               != (dn.data_blkaddr + i)) || maxblocks == i)
-                               break;
-               map_bh(bh_result, inode->i_sb, dn.data_blkaddr);
-               bh_result->b_size = (((size_t)i) << blkbits);
+               if (blkaddr == (bh_result->b_blocknr + ofs)) {
+                       ofs++;
+                       dn.ofs_in_node++;
+                       pgofs++;
+                       bh_result->b_size += (((size_t)1) << blkbits);
+                       goto get_next;
+               }
        }
+sync_out:
+       if (allocated)
+               sync_inode_page(&dn);
+put_out:
        f2fs_put_dnode(&dn);
-       trace_f2fs_get_data_block(inode, iblock, bh_result, 0);
-       return 0;
+unlock_out:
+       if (create)
+               f2fs_unlock_op(sbi);
+out:
+       trace_f2fs_get_data_block(inode, iblock, bh_result, err);
+       return err;
 }
 
 static int f2fs_read_data_page(struct file *file, struct page *page)
 {
-       return mpage_readpage(page, get_data_block_ro);
+       struct inode *inode = page->mapping->host;
+       int ret;
+
+       /* If the file has inline data, try to read it directlly */
+       if (f2fs_has_inline_data(inode))
+               ret = f2fs_read_inline_data(inode, page);
+       else
+               ret = mpage_readpage(page, get_data_block);
+
+       return ret;
 }
 
 static int f2fs_read_data_pages(struct file *file,
                        struct address_space *mapping,
                        struct list_head *pages, unsigned nr_pages)
 {
-       return mpage_readpages(mapping, pages, nr_pages, get_data_block_ro);
+       struct inode *inode = file->f_mapping->host;
+
+       /* If the file has inline data, skip readpages */
+       if (f2fs_has_inline_data(inode))
+               return 0;
+
+       return mpage_readpages(mapping, pages, nr_pages, get_data_block);
 }
 
-int do_write_data_page(struct page *page)
+int do_write_data_page(struct page *page, struct f2fs_io_info *fio)
 {
        struct inode *inode = page->mapping->host;
-       block_t old_blk_addr, new_blk_addr;
+       block_t old_blkaddr, new_blkaddr;
        struct dnode_of_data dn;
        int err = 0;
 
@@ -654,10 +754,10 @@ int do_write_data_page(struct page *page)
        if (err)
                return err;
 
-       old_blk_addr = dn.data_blkaddr;
+       old_blkaddr = dn.data_blkaddr;
 
        /* This page is already truncated */
-       if (old_blk_addr == NULL_ADDR)
+       if (old_blkaddr == NULL_ADDR)
                goto out_writepage;
 
        set_page_writeback(page);
@@ -666,15 +766,13 @@ int do_write_data_page(struct page *page)
         * If current allocation needs SSR,
         * it had better in-place writes for updated data.
         */
-       if (unlikely(old_blk_addr != NEW_ADDR &&
+       if (unlikely(old_blkaddr != NEW_ADDR &&
                        !is_cold_data(page) &&
                        need_inplace_update(inode))) {
-               rewrite_data_page(F2FS_SB(inode->i_sb), page,
-                                               old_blk_addr);
+               rewrite_data_page(page, old_blkaddr, fio);
        } else {
-               write_data_page(inode, page, &dn,
-                               old_blk_addr, &new_blk_addr);
-               update_extent_cache(new_blk_addr, &dn);
+               write_data_page(page, &dn, &new_blkaddr, fio);
+               update_extent_cache(new_blkaddr, &dn);
        }
 out_writepage:
        f2fs_put_dnode(&dn);
@@ -689,9 +787,13 @@ static int f2fs_write_data_page(struct page *page,
        loff_t i_size = i_size_read(inode);
        const pgoff_t end_index = ((unsigned long long) i_size)
                                                        >> PAGE_CACHE_SHIFT;
-       unsigned offset;
+       unsigned offset = 0;
        bool need_balance_fs = false;
        int err = 0;
+       struct f2fs_io_info fio = {
+               .type = DATA,
+               .rw = (wbc->sync_mode == WB_SYNC_ALL) ? WRITE_SYNC: WRITE,
+       };
 
        if (page->index < end_index)
                goto write;
@@ -720,10 +822,18 @@ write:
        if (S_ISDIR(inode->i_mode)) {
                dec_page_count(sbi, F2FS_DIRTY_DENTS);
                inode_dec_dirty_dents(inode);
-               err = do_write_data_page(page);
+               err = do_write_data_page(page, &fio);
        } else {
                f2fs_lock_op(sbi);
-               err = do_write_data_page(page);
+
+               if (f2fs_has_inline_data(inode) || f2fs_may_inline(inode)) {
+                       err = f2fs_write_inline_data(inode, page, offset);
+                       f2fs_unlock_op(sbi);
+                       goto out;
+               } else {
+                       err = do_write_data_page(page, &fio);
+               }
+
                f2fs_unlock_op(sbi);
                need_balance_fs = true;
        }
@@ -732,8 +842,10 @@ write:
        else if (err)
                goto redirty_out;
 
-       if (wbc->for_reclaim)
-               f2fs_submit_merged_bio(sbi, DATA, true, WRITE);
+       if (wbc->for_reclaim) {
+               f2fs_submit_merged_bio(sbi, DATA, WRITE);
+               need_balance_fs = false;
+       }
 
        clear_cold_data(page);
 out:
@@ -785,7 +897,8 @@ static int f2fs_write_data_pages(struct address_space *mapping,
        ret = write_cache_pages(mapping, wbc, __f2fs_writepage, mapping);
        if (locked)
                mutex_unlock(&sbi->writepages);
-       f2fs_submit_merged_bio(sbi, DATA, wbc->sync_mode == WB_SYNC_ALL, WRITE);
+
+       f2fs_submit_merged_bio(sbi, DATA, WRITE);
 
        remove_dirty_dir_inode(inode);
 
@@ -806,11 +919,18 @@ static int f2fs_write_begin(struct file *file, struct address_space *mapping,
 
        f2fs_balance_fs(sbi);
 repeat:
+       err = f2fs_convert_inline_data(inode, pos + len);
+       if (err)
+               return err;
+
        page = grab_cache_page_write_begin(mapping, index, flags);
        if (!page)
                return -ENOMEM;
        *pagep = page;
 
+       if (f2fs_has_inline_data(inode) && (pos + len) <= MAX_INLINE_DATA)
+               goto inline_data;
+
        f2fs_lock_op(sbi);
        set_new_dnode(&dn, inode, NULL, NULL, 0);
        err = f2fs_reserve_block(&dn, index);
@@ -820,7 +940,7 @@ repeat:
                f2fs_put_page(page, 1);
                return err;
        }
-
+inline_data:
        if ((len == PAGE_CACHE_SIZE) || PageUptodate(page))
                return 0;
 
@@ -836,16 +956,19 @@ repeat:
        if (dn.data_blkaddr == NEW_ADDR) {
                zero_user_segment(page, 0, PAGE_CACHE_SIZE);
        } else {
-               err = f2fs_submit_page_bio(sbi, page, dn.data_blkaddr,
+               if (f2fs_has_inline_data(inode))
+                       err = f2fs_read_inline_data(inode, page);
+               else
+                       err = f2fs_submit_page_bio(sbi, page, dn.data_blkaddr,
                                                        READ_SYNC);
                if (err)
                        return err;
                lock_page(page);
-               if (!PageUptodate(page)) {
+               if (unlikely(!PageUptodate(page))) {
                        f2fs_put_page(page, 1);
                        return -EIO;
                }
-               if (page->mapping != mapping) {
+               if (unlikely(page->mapping != mapping)) {
                        f2fs_put_page(page, 1);
                        goto repeat;
                }
@@ -876,18 +999,39 @@ static int f2fs_write_end(struct file *file,
        return copied;
 }
 
+static int check_direct_IO(struct inode *inode, int rw,
+               const struct iovec *iov, loff_t offset, unsigned long nr_segs)
+{
+       unsigned blocksize_mask = inode->i_sb->s_blocksize - 1;
+       int i;
+
+       if (rw == READ)
+               return 0;
+
+       if (offset & blocksize_mask)
+               return -EINVAL;
+
+       for (i = 0; i < nr_segs; i++)
+               if (iov[i].iov_len & blocksize_mask)
+                       return -EINVAL;
+       return 0;
+}
+
 static ssize_t f2fs_direct_IO(int rw, struct kiocb *iocb,
                const struct iovec *iov, loff_t offset, unsigned long nr_segs)
 {
        struct file *file = iocb->ki_filp;
        struct inode *inode = file->f_mapping->host;
 
-       if (rw == WRITE)
+       /* Let buffer I/O handle the inline data case. */
+       if (f2fs_has_inline_data(inode))
+               return 0;
+
+       if (check_direct_IO(inode, rw, iov, offset, nr_segs))
                return 0;
 
-       /* Needs synchronization with the cleaner */
        return blockdev_direct_IO(rw, iocb, inode, iov, offset, nr_segs,
-                                                 get_data_block_ro);
+                                                       get_data_block);
 }
 
 static void f2fs_invalidate_data_page(struct page *page, unsigned int offset,
@@ -926,7 +1070,7 @@ static int f2fs_set_data_page_dirty(struct page *page)
 
 static sector_t f2fs_bmap(struct address_space *mapping, sector_t block)
 {
-       return generic_block_bmap(mapping, block, get_data_block_ro);
+       return generic_block_bmap(mapping, block, get_data_block);
 }
 
 const struct address_space_operations f2fs_dblock_aops = {