diff options
author | Jaegeuk Kim <jaegeuk@kernel.org> | 2015-02-09 15:09:53 -0500 |
---|---|---|
committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2015-02-11 20:04:49 -0500 |
commit | 59b802e5a453d413e7222d179be405cbadca3a8e (patch) | |
tree | ba2e0c886467cd3303f16add3afd9995d62e2376 /fs | |
parent | f7ef9b83b583640111039b30e13263b71c3a6ed5 (diff) |
f2fs: allocate data blocks in advance for f2fs_direct_IO
This patch adds preallocation for data blocks to prepare f2fs_direct_IO.
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/f2fs/data.c | 57 |
1 files changed, 54 insertions, 3 deletions
diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index 26e247697e58..985ed023a750 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c | |||
@@ -592,6 +592,56 @@ static int __allocate_data_block(struct dnode_of_data *dn) | |||
592 | return 0; | 592 | return 0; |
593 | } | 593 | } |
594 | 594 | ||
595 | static void __allocate_data_blocks(struct inode *inode, loff_t offset, | ||
596 | size_t count) | ||
597 | { | ||
598 | struct f2fs_sb_info *sbi = F2FS_I_SB(inode); | ||
599 | struct dnode_of_data dn; | ||
600 | u64 start = F2FS_BYTES_TO_BLK(offset); | ||
601 | u64 len = F2FS_BYTES_TO_BLK(count); | ||
602 | bool allocated; | ||
603 | u64 end_offset; | ||
604 | |||
605 | while (len) { | ||
606 | f2fs_balance_fs(sbi); | ||
607 | f2fs_lock_op(sbi); | ||
608 | |||
609 | /* When reading holes, we need its node page */ | ||
610 | set_new_dnode(&dn, inode, NULL, NULL, 0); | ||
611 | if (get_dnode_of_data(&dn, start, ALLOC_NODE)) | ||
612 | goto out; | ||
613 | |||
614 | allocated = false; | ||
615 | end_offset = ADDRS_PER_PAGE(dn.node_page, F2FS_I(inode)); | ||
616 | |||
617 | while (dn.ofs_in_node < end_offset && len) { | ||
618 | if (dn.data_blkaddr == NULL_ADDR) { | ||
619 | if (__allocate_data_block(&dn)) | ||
620 | goto sync_out; | ||
621 | allocated = true; | ||
622 | } | ||
623 | len--; | ||
624 | start++; | ||
625 | dn.ofs_in_node++; | ||
626 | } | ||
627 | |||
628 | if (allocated) | ||
629 | sync_inode_page(&dn); | ||
630 | |||
631 | f2fs_put_dnode(&dn); | ||
632 | f2fs_unlock_op(sbi); | ||
633 | } | ||
634 | return; | ||
635 | |||
636 | sync_out: | ||
637 | if (allocated) | ||
638 | sync_inode_page(&dn); | ||
639 | f2fs_put_dnode(&dn); | ||
640 | out: | ||
641 | f2fs_unlock_op(sbi); | ||
642 | return; | ||
643 | } | ||
644 | |||
595 | /* | 645 | /* |
596 | * get_data_block() now supported readahead/bmap/rw direct_IO with mapped bh. | 646 | * get_data_block() now supported readahead/bmap/rw direct_IO with mapped bh. |
597 | * If original data blocks are allocated, then give them to blockdev. | 647 | * If original data blocks are allocated, then give them to blockdev. |
@@ -617,10 +667,8 @@ static int __get_data_block(struct inode *inode, sector_t iblock, | |||
617 | if (check_extent_cache(inode, pgofs, bh_result)) | 667 | if (check_extent_cache(inode, pgofs, bh_result)) |
618 | goto out; | 668 | goto out; |
619 | 669 | ||
620 | if (create) { | 670 | if (create) |
621 | f2fs_balance_fs(F2FS_I_SB(inode)); | ||
622 | f2fs_lock_op(F2FS_I_SB(inode)); | 671 | f2fs_lock_op(F2FS_I_SB(inode)); |
623 | } | ||
624 | 672 | ||
625 | /* When reading holes, we need its node page */ | 673 | /* When reading holes, we need its node page */ |
626 | set_new_dnode(&dn, inode, NULL, NULL, 0); | 674 | set_new_dnode(&dn, inode, NULL, NULL, 0); |
@@ -1108,6 +1156,9 @@ static ssize_t f2fs_direct_IO(int rw, struct kiocb *iocb, | |||
1108 | 1156 | ||
1109 | trace_f2fs_direct_IO_enter(inode, offset, count, rw); | 1157 | trace_f2fs_direct_IO_enter(inode, offset, count, rw); |
1110 | 1158 | ||
1159 | if (rw & WRITE) | ||
1160 | __allocate_data_blocks(inode, offset, count); | ||
1161 | |||
1111 | err = blockdev_direct_IO(rw, iocb, inode, iter, offset, get_data_block); | 1162 | err = blockdev_direct_IO(rw, iocb, inode, iter, offset, get_data_block); |
1112 | if (err < 0 && (rw & WRITE)) | 1163 | if (err < 0 && (rw & WRITE)) |
1113 | f2fs_write_failed(mapping, offset + count); | 1164 | f2fs_write_failed(mapping, offset + count); |