2013-06-23 22:51:53

by Jaegeuk Kim

[permalink] [raw]
Subject: [PATCH] f2fs: fix an endian conversion bug detected by sparse

This patch should fix the following bug reported by kbuild test robot.

fs/f2fs/recovery.c:233:33: sparse: incorrect type in assignment
(different base types)

parse warnings: (new ones prefixed by >>)

>> fs/f2fs/recovery.c:233:33: sparse: incorrect type in assignment (different base types)
fs/f2fs/recovery.c:233:33: expected unsigned int [unsigned] [assigned] ofs_in_node
fs/f2fs/recovery.c:233:33: got restricted __le16 [assigned] [usertype] ofs_in_node
>> fs/f2fs/recovery.c:238:33: sparse: incorrect type in assignment (different base types)
fs/f2fs/recovery.c:238:33: expected unsigned int [unsigned] ofs_in_node
fs/f2fs/recovery.c:238:33: got restricted __le16 [assigned] [usertype] ofs_in_node

Signed-off-by: Jaegeuk Kim <[email protected]>
---
fs/f2fs/recovery.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/f2fs/recovery.c b/fs/f2fs/recovery.c
index ddde14f..9db8239 100644
--- a/fs/f2fs/recovery.c
+++ b/fs/f2fs/recovery.c
@@ -246,12 +246,12 @@ static int check_index_in_prev_nodes(struct f2fs_sb_info *sbi,
struct dnode_of_data tdn = *dn;
tdn.nid = nid;
tdn.node_page = dn->inode_page;
- tdn.ofs_in_node = sum.ofs_in_node;
+ tdn.ofs_in_node = le16_to_cpu(sum.ofs_in_node);
truncate_data_blocks_range(&tdn, 1);
return 0;
} else if (dn->nid == nid) {
struct dnode_of_data tdn = *dn;
- tdn.ofs_in_node = sum.ofs_in_node;
+ tdn.ofs_in_node = le16_to_cpu(sum.ofs_in_node);
truncate_data_blocks_range(&tdn, 1);
return 0;
}
--
1.8.3.1.437.g0dbd812