From 3769a71dc2312c3487e8108ef19b42f728fd9548 Mon Sep 17 00:00:00 2001
From: Jaegeuk Kim <jaegeuk.kim@samsung.com>
Date: Fri, 21 Dec 2012 11:47:05 +0900
Subject: [PATCH] --- yaml --- r: 348154 b: refs/heads/master c:
 12a67146e35ba1d04ac4a5430eaaa8790158d60e h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/fs/f2fs/segment.c | 7 +++----
 trunk/fs/f2fs/super.c   | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 08e1db6274e2..f37994325ff5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 71e9fec548a95b2a4cf378646addd5d3098684a2
+refs/heads/master: 12a67146e35ba1d04ac4a5430eaaa8790158d60e
diff --git a/trunk/fs/f2fs/segment.c b/trunk/fs/f2fs/segment.c
index ca7b5ffb09d5..fe2cc0bdc115 100644
--- a/trunk/fs/f2fs/segment.c
+++ b/trunk/fs/f2fs/segment.c
@@ -791,11 +791,10 @@ static int __get_segment_type(struct page *page, enum page_type p_type)
 		return __get_segment_type_2(page, p_type);
 	case 4:
 		return __get_segment_type_4(page, p_type);
-	case 6:
-		return __get_segment_type_6(page, p_type);
-	default:
-		BUG();
 	}
+	/* NR_CURSEG_TYPE(6) logs by default */
+	BUG_ON(sbi->active_logs != NR_CURSEG_TYPE);
+	return __get_segment_type_6(page, p_type);
 }
 
 static void do_write_page(struct f2fs_sb_info *sbi, struct page *page,
diff --git a/trunk/fs/f2fs/super.c b/trunk/fs/f2fs/super.c
index 50240d28ca24..cf0ffb800654 100644
--- a/trunk/fs/f2fs/super.c
+++ b/trunk/fs/f2fs/super.c
@@ -302,7 +302,7 @@ static int parse_options(struct f2fs_sb_info *sbi, char *options)
 		case Opt_active_logs:
 			if (args->from && match_int(args, &arg))
 				return -EINVAL;
-			if (arg != 2 && arg != 4 && arg != 6)
+			if (arg != 2 && arg != 4 && arg != NR_CURSEG_TYPE)
 				return -EINVAL;
 			sbi->active_logs = arg;
 			break;