From: Jaegeuk Kim <jaegeuk@kernel.org>
Date: Mon, 27 Oct 2014 20:54:27 +0000 (-0700)
Subject: f2fs: do not discard data protected by the previous checkpoint
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=e3fb1b794b5f0c9f9b65707ce4e6be264a9c60f8;p=deliverable%2Flinux.git

f2fs: do not discard data protected by the previous checkpoint

We should not discard any data protected by the previous checkpoint all
the time.

Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
---

diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index d391a5913c79..06dda733f958 100644
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -517,7 +517,7 @@ static void add_discard_addrs(struct f2fs_sb_info *sbi, struct cp_control *cpc)
 
 	/* SIT_VBLOCK_MAP_SIZE should be multiple of sizeof(unsigned long) */
 	for (i = 0; i < entries; i++)
-		dmap[i] = (cur_map[i] ^ ckpt_map[i]) & ckpt_map[i];
+		dmap[i] = ~(cur_map[i] | ckpt_map[i]);
 
 	while (force || SM_I(sbi)->nr_discards <= SM_I(sbi)->max_discards) {
 		start = __find_rev_next_bit(dmap, max_blocks, end + 1);