f2fs: assign segments correctly for direct_io
authorJaegeuk Kim <jaegeuk@kernel.org>
Fri, 4 Nov 2016 21:33:57 +0000 (14:33 -0700)
committerJaegeuk Kim <jaegeuk@kernel.org>
Wed, 23 Nov 2016 20:11:28 +0000 (12:11 -0800)
Previously, we assigned CURSEG_WARM_DATA for direct_io, but if we have two or
four logs, we do not use that type at all.
Let's fix it.

Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
fs/f2fs/segment.c

index 5e7e311758f8dd4d03c7ea12a9fdf1373c49c6a4..7fb7dd3d1e7422ee3e0dd6455521561d46202c76 100644 (file)
@@ -1501,8 +1501,12 @@ void allocate_data_block(struct f2fs_sb_info *sbi, struct page *page,
        struct curseg_info *curseg;
        bool direct_io = (type == CURSEG_DIRECT_IO);
 
-       type = direct_io ? CURSEG_WARM_DATA : type;
-
+       if (direct_io) {
+               if (sbi->active_logs <= 4)
+                       type = CURSEG_HOT_DATA;
+               else
+                       type = CURSEG_WARM_DATA;
+       }
        curseg = CURSEG_I(sbi, type);
 
        mutex_lock(&curseg->curseg_mutex);