From: Kinglong Mee <kinglongmee@gmail.com>
Date: Thu, 23 Feb 2017 11:55:05 +0000 (+0800)
Subject: f2fs: avoid m_flags overlay when allocating more data blocks
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=3f2be04304cf10f2ef074399f8dd565bd00ddcae;p=openwrt%2Fstaging%2Fblogic.git

f2fs: avoid m_flags overlay when allocating more data blocks

When more than one data blocks are allocated, the F2FS_MAP_UNWRITTEN/MAPPED
flags will be overlapped by F2FS_MAP_NEW at the later times.

Signed-off-by: Kinglong Mee <kinglongmee@gmail.com>
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
---

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index f72493d8c8e4..80f9863dc4b0 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -867,7 +867,7 @@ next_block:
 			}
 			if (err)
 				goto sync_out;
-			map->m_flags = F2FS_MAP_NEW;
+			map->m_flags |= F2FS_MAP_NEW;
 			blkaddr = dn.data_blkaddr;
 		} else {
 			if (flag == F2FS_GET_BLOCK_BMAP) {