f2fs: kill heap-based allocation

[linux-2.6-microblaze.git] / fs / f2fs / segment.c

diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index 1518f12..471fa7a 100644 (file)
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -2640,16 +2640,14 @@ static int is_next_segment_free(struct f2fs_sb_info *sbi,
  * This function should be returned with success, otherwise BUG
  */
 static void get_new_segment(struct f2fs_sb_info *sbi,
-                       unsigned int *newseg, bool new_sec, int dir)
+                       unsigned int *newseg, bool new_sec)
 {
        struct free_segmap_info *free_i = FREE_I(sbi);
        unsigned int segno, secno, zoneno;
        unsigned int total_zones = MAIN_SECS(sbi) / sbi->secs_per_zone;
        unsigned int hint = GET_SEC_FROM_SEG(sbi, *newseg);
        unsigned int old_zoneno = GET_ZONE_FROM_SEG(sbi, *newseg);
-       unsigned int left_start = hint;
        bool init = true;
-       int go_left = 0;
        int i;
 
        spin_lock(&free_i->segmap_lock);
@@ -2663,30 +2661,10 @@ static void get_new_segment(struct f2fs_sb_info *sbi,
 find_other_zone:
        secno = find_next_zero_bit(free_i->free_secmap, MAIN_SECS(sbi), hint);
        if (secno >= MAIN_SECS(sbi)) {
-               if (dir == ALLOC_RIGHT) {
-                       secno = find_first_zero_bit(free_i->free_secmap,
+               secno = find_first_zero_bit(free_i->free_secmap,
                                                        MAIN_SECS(sbi));
-                       f2fs_bug_on(sbi, secno >= MAIN_SECS(sbi));
-               } else {
-                       go_left = 1;
-                       left_start = hint - 1;
-               }
-       }
-       if (go_left == 0)
-               goto skip_left;
-
-       while (test_bit(left_start, free_i->free_secmap)) {
-               if (left_start > 0) {
-                       left_start--;
-                       continue;
-               }
-               left_start = find_first_zero_bit(free_i->free_secmap,
-                                                       MAIN_SECS(sbi));
-               f2fs_bug_on(sbi, left_start >= MAIN_SECS(sbi));
-               break;
+               f2fs_bug_on(sbi, secno >= MAIN_SECS(sbi));
        }
-       secno = left_start;
-skip_left:
        segno = GET_SEG_FROM_SEC(sbi, secno);
        zoneno = GET_ZONE_FROM_SEC(sbi, secno);
 
@@ -2697,21 +2675,13 @@ skip_left:
                goto got_it;
        if (zoneno == old_zoneno)
                goto got_it;
-       if (dir == ALLOC_LEFT) {
-               if (!go_left && zoneno + 1 >= total_zones)
-                       goto got_it;
-               if (go_left && zoneno == 0)
-                       goto got_it;
-       }
        for (i = 0; i < NR_CURSEG_TYPE; i++)
                if (CURSEG_I(sbi, i)->zone == zoneno)
                        break;
 
        if (i < NR_CURSEG_TYPE) {
                /* zone is in user, try another */
-               if (go_left)
-                       hint = zoneno * sbi->secs_per_zone - 1;
-               else if (zoneno + 1 >= total_zones)
+               if (zoneno + 1 >= total_zones)
                        hint = 0;
                else
                        hint = (zoneno + 1) * sbi->secs_per_zone;
@@ -2769,8 +2739,7 @@ static unsigned int __get_next_segno(struct f2fs_sb_info *sbi, int type)
        if (unlikely(is_sbi_flag_set(sbi, SBI_CP_DISABLED)))
                return 0;
 
-       if (test_opt(sbi, NOHEAP) &&
-               (seg_type == CURSEG_HOT_DATA || IS_NODESEG(seg_type)))
+       if (seg_type == CURSEG_HOT_DATA || IS_NODESEG(seg_type))
                return 0;
 
        if (SIT_I(sbi)->last_victim[ALLOC_NEXT])
@@ -2790,21 +2759,12 @@ static unsigned int __get_next_segno(struct f2fs_sb_info *sbi, int type)
 static void new_curseg(struct f2fs_sb_info *sbi, int type, bool new_sec)
 {
        struct curseg_info *curseg = CURSEG_I(sbi, type);
-       unsigned short seg_type = curseg->seg_type;
        unsigned int segno = curseg->segno;
-       int dir = ALLOC_LEFT;
 
        if (curseg->inited)
-               write_sum_page(sbi, curseg->sum_blk,
-                               GET_SUM_BLOCK(sbi, segno));
-       if (seg_type == CURSEG_WARM_DATA || seg_type == CURSEG_COLD_DATA)
-               dir = ALLOC_RIGHT;
-
-       if (test_opt(sbi, NOHEAP))
-               dir = ALLOC_RIGHT;
-
+               write_sum_page(sbi, curseg->sum_blk, GET_SUM_BLOCK(sbi, segno));
        segno = __get_next_segno(sbi, type);
-       get_new_segment(sbi, &segno, new_sec, dir);
+       get_new_segment(sbi, &segno, new_sec);
        curseg->next_segno = segno;
        reset_curseg(sbi, type, 1);
        curseg->alloc_type = LFS;