diff options
author | Gu Zheng <guz.fnst@cn.fujitsu.com> | 2013-08-18 21:41:15 -0400 |
---|---|---|
committer | Jaegeuk Kim <jaegeuk.kim@samsung.com> | 2013-08-18 22:51:08 -0400 |
commit | 7b40527508670e56d817b837b2114bc340446539 (patch) | |
tree | bf94c98dd72fd03d556461e0778d2bf485f5dbf8 /fs | |
parent | 92c4342fb72a6baf9ee9fcd079b46ed0286ebe33 (diff) |
f2fs: fix a compound statement label error
An error "label at end of compound statement" will occur if CONFIG_F2FS_STAT_FS
disabled.
fs/f2fs/segment.c:556:1: error: label at end of compound statement
So clean up the 'out' label to fix it.
Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Gu Zheng <guz.fnst@cn.fujitsu.com>
Signed-off-by: Jaegeuk Kim <jaegeuk.kim@samsung.com>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/f2fs/segment.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c index 9c45b8ee6881..09af9c7b0f52 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c | |||
@@ -540,12 +540,9 @@ static void allocate_segment_by_default(struct f2fs_sb_info *sbi, | |||
540 | { | 540 | { |
541 | struct curseg_info *curseg = CURSEG_I(sbi, type); | 541 | struct curseg_info *curseg = CURSEG_I(sbi, type); |
542 | 542 | ||
543 | if (force) { | 543 | if (force) |
544 | new_curseg(sbi, type, true); | 544 | new_curseg(sbi, type, true); |
545 | goto out; | 545 | else if (type == CURSEG_WARM_NODE) |
546 | } | ||
547 | |||
548 | if (type == CURSEG_WARM_NODE) | ||
549 | new_curseg(sbi, type, false); | 546 | new_curseg(sbi, type, false); |
550 | else if (curseg->alloc_type == LFS && is_next_segment_free(sbi, type)) | 547 | else if (curseg->alloc_type == LFS && is_next_segment_free(sbi, type)) |
551 | new_curseg(sbi, type, false); | 548 | new_curseg(sbi, type, false); |
@@ -553,7 +550,6 @@ static void allocate_segment_by_default(struct f2fs_sb_info *sbi, | |||
553 | change_curseg(sbi, type, true); | 550 | change_curseg(sbi, type, true); |
554 | else | 551 | else |
555 | new_curseg(sbi, type, false); | 552 | new_curseg(sbi, type, false); |
556 | out: | ||
557 | #ifdef CONFIG_F2FS_STAT_FS | 553 | #ifdef CONFIG_F2FS_STAT_FS |
558 | sbi->segment_count[curseg->alloc_type]++; | 554 | sbi->segment_count[curseg->alloc_type]++; |
559 | #endif | 555 | #endif |