f2fs: fix to avoid allocating WARM_DATA segment for direct IO

If active_log is not 6, we never use WARM_DATA segment, let's
avoid allocating WARM_DATA segment for direct IO.

Signed-off-by: Yunlei He <heyunlei@oppo.com>
Signed-off-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index bee1e45f76b8a77e1aee692faf5f9e83743c8f5f..0c516c653f0507afc6bda5b2b7362206294fb99c 100644 (file)
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -4179,7 +4179,8 @@ static int f2fs_iomap_begin(struct inode *inode, loff_t offset, loff_t length,
        map.m_lblk = bytes_to_blks(inode, offset);
        map.m_len = bytes_to_blks(inode, offset + length - 1) - map.m_lblk + 1;
        map.m_next_pgofs = &next_pgofs;
-       map.m_seg_type = f2fs_rw_hint_to_seg_type(inode->i_write_hint);
+       map.m_seg_type = f2fs_rw_hint_to_seg_type(F2FS_I_SB(inode),
+                                               inode->i_write_hint);
        if (flags & IOMAP_WRITE)
                map.m_may_create = true;
 

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index a0ae99bcca39bfbec9ba54c292219cfd2cb9e464..3a95c8ccb9e0b1f01231e401f741f79bdb0238b5 100644 (file)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -3745,7 +3745,7 @@ int f2fs_build_segment_manager(struct f2fs_sb_info *sbi);
 void f2fs_destroy_segment_manager(struct f2fs_sb_info *sbi);
 int __init f2fs_create_segment_manager_caches(void);
 void f2fs_destroy_segment_manager_caches(void);
-int f2fs_rw_hint_to_seg_type(enum rw_hint hint);
+int f2fs_rw_hint_to_seg_type(struct f2fs_sb_info *sbi, enum rw_hint hint);
 enum rw_hint f2fs_io_type_to_rw_hint(struct f2fs_sb_info *sbi,
                        enum page_type type, enum temp_type temp);
 unsigned int f2fs_usable_segs_in_sec(struct f2fs_sb_info *sbi,

diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index d382f8bc2fbe6f0dc25a5c560bff245f731c7587..f1a6b4da5746607ba4cb68fff186e520d7a41775 100644 (file)
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -4637,7 +4637,8 @@ static int f2fs_preallocate_blocks(struct kiocb *iocb, struct iov_iter *iter,
 
        map.m_may_create = true;
        if (dio) {
-               map.m_seg_type = f2fs_rw_hint_to_seg_type(inode->i_write_hint);
+               map.m_seg_type = f2fs_rw_hint_to_seg_type(sbi,
+                                               inode->i_write_hint);
                flag = F2FS_GET_BLOCK_PRE_DIO;
        } else {
                map.m_seg_type = NO_CHECK_TYPE;
@@ -4690,7 +4691,7 @@ static void f2fs_dio_write_submit_io(const struct iomap_iter *iter,
 {
        struct inode *inode = iter->inode;
        struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
-       int seg_type = f2fs_rw_hint_to_seg_type(inode->i_write_hint);
+       int seg_type = f2fs_rw_hint_to_seg_type(sbi, inode->i_write_hint);
        enum temp_type temp = f2fs_get_segment_temp(seg_type);
 
        bio->bi_write_hint = f2fs_io_type_to_rw_hint(sbi, DATA, temp);

diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index 4396df2bceab9928d8817e90e5ee768a76ff0009..8ddd4f1c665a00240fb61c74a0604c10afbc6f80 100644 (file)
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -3351,8 +3351,14 @@ out:
        return err;
 }
 
-int f2fs_rw_hint_to_seg_type(enum rw_hint hint)
+int f2fs_rw_hint_to_seg_type(struct f2fs_sb_info *sbi, enum rw_hint hint)
 {
+       if (F2FS_OPTION(sbi).active_logs == 2)
+               return CURSEG_HOT_DATA;
+       else if (F2FS_OPTION(sbi).active_logs == 4)
+               return CURSEG_COLD_DATA;
+
+       /* active_log == 6 */
        switch (hint) {
        case WRITE_LIFE_SHORT:
                return CURSEG_HOT_DATA;
@@ -3492,7 +3498,8 @@ static int __get_segment_type_6(struct f2fs_io_info *fio)
                                is_inode_flag_set(inode, FI_HOT_DATA) ||
                                f2fs_is_cow_file(inode))
                        return CURSEG_HOT_DATA;
-               return f2fs_rw_hint_to_seg_type(inode->i_write_hint);
+               return f2fs_rw_hint_to_seg_type(F2FS_I_SB(inode),
+                                               inode->i_write_hint);
        } else {
                if (IS_DNODE(fio->page))
                        return is_cold_node(fio->page) ? CURSEG_WARM_NODE :