f2fs: enable flush_merge only in f2fs is not read-only
authorGu Zheng <guz.fnst@cn.fujitsu.com>
Fri, 11 Apr 2014 09:49:55 +0000 (17:49 +0800)
committerJaegeuk Kim <jaegeuk.kim@samsung.com>
Wed, 7 May 2014 01:21:54 +0000 (10:21 +0900)
Enable flush_merge only in f2fs is not read-only, so does the mount
option show.

Signed-off-by: Gu Zheng <guz.fnst@cn.fujitsu.com>
Signed-off-by: Jaegeuk Kim <jaegeuk.kim@samsung.com>
fs/f2fs/segment.c
fs/f2fs/super.c

Simple merge
diff --cc fs/f2fs/super.c
Simple merge