Commit 09eb483e authored by Jaegeuk Kim's avatar Jaegeuk Kim
Browse files

f2fs: fix missing cold bit during recovery 



In do_recover_data, we find and update previous node pages after updating
its new block addresses.
After then, we call fill_node_footer without reset field, we erase its
cold bit so that this new cold node block is written to wrong log area.
This patch fixes not to miss its old flag.

Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent b9a2c252

fs/f2fs/node.h

+9 −1
Original line number Diff line number Diff line
@@ -212,11 +212,19 @@ static inline void fill_node_footer(struct page *page, nid_t nid, 
				nid_t ino, unsigned int ofs, bool reset)

{

	struct f2fs_node *rn = F2FS_NODE(page);

	unsigned int old_flag = 0;



	if (reset)

		memset(rn, 0, sizeof(*rn));

	else

		old_flag = le32_to_cpu(rn->footer.flag);



	rn->footer.nid = cpu_to_le32(nid);

	rn->footer.ino = cpu_to_le32(ino);

	rn->footer.flag = cpu_to_le32(ofs << OFFSET_BIT_SHIFT);



	/* should remain old flag bits such as COLD_BIT_SHIFT */

	rn->footer.flag = cpu_to_le32((ofs << OFFSET_BIT_SHIFT) |

					(old_flag & OFFSET_BIT_MASK));

}



static inline void copy_node_footer(struct page *dst, struct page *src)

include/linux/f2fs_fs.h

+2 −0
Original line number Diff line number Diff line
@@ -224,6 +224,8 @@ enum { 
	OFFSET_BIT_SHIFT

};



#define OFFSET_BIT_MASK		(0x07)	/* (0x01 << OFFSET_BIT_SHIFT) - 1 */



struct node_footer {

	__le32 nid;		/* node id */

	__le32 ino;		/* inode nunmber */

CRA Git | Maintained and supported by SUSTech CRA and CCSE