aboutsummaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorEric Biggers <ebiggers@google.com>2016-10-11 10:36:12 -0700
committerMister Oyster <oysterized@gmail.com>2017-04-13 12:34:17 +0200
commit3ab99cc83ad85772102d7dc233d6ccc3301ff1fa (patch)
tree4d706852f58f4e723aa710057f0f50dbfce67c21 /fs
parent90ee2d4b79ec3419fb621cae2d4f00268809fb05 (diff)
f2fs: fix sparse warnings
f2fs contained a number of endianness conversion bugs. Also, one function should have been 'static'. Found with sparse by running 'make C=2 CF=-D__CHECK_ENDIAN__ fs/f2fs/' Signed-off-by: Eric Biggers <ebiggers@google.com> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/f2fs/dir.c2
-rw-r--r--fs/f2fs/inline.c2
-rw-r--r--fs/f2fs/node.c5
-rw-r--r--fs/f2fs/node.h2
4 files changed, 6 insertions, 5 deletions
diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c
index 9a0d3e558..24bf5e95e 100644
--- a/fs/f2fs/dir.c
+++ b/fs/f2fs/dir.c
@@ -137,7 +137,7 @@ struct f2fs_dir_entry *find_target_dentry(struct fscrypt_name *fname,
/* show encrypted name */
if (fname->hash) {
- if (de->hash_code == fname->hash)
+ if (de->hash_code == cpu_to_le32(fname->hash))
goto found;
} else if (de_name.len == name->len &&
de->hash_code == namehash &&
diff --git a/fs/f2fs/inline.c b/fs/f2fs/inline.c
index 44d92fc6e..06c55e0e5 100644
--- a/fs/f2fs/inline.c
+++ b/fs/f2fs/inline.c
@@ -420,7 +420,7 @@ static int f2fs_add_inline_entries(struct inode *dir,
}
new_name.name = d.filename[bit_pos];
- new_name.len = de->name_len;
+ new_name.len = le16_to_cpu(de->name_len);
ino = le32_to_cpu(de->ino);
fake_mode = get_de_type(de) << S_SHIFT;
diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
index 8f53e2a42..789843003 100644
--- a/fs/f2fs/node.c
+++ b/fs/f2fs/node.c
@@ -280,8 +280,9 @@ static void cache_nat_entry(struct f2fs_sb_info *sbi, nid_t nid,
e = grab_nat_entry(nm_i, nid);
node_info_from_raw_nat(&e->ni, ne);
} else {
- f2fs_bug_on(sbi, nat_get_ino(e) != ne->ino ||
- nat_get_blkaddr(e) != ne->block_addr ||
+ f2fs_bug_on(sbi, nat_get_ino(e) != le32_to_cpu(ne->ino) ||
+ nat_get_blkaddr(e) !=
+ le32_to_cpu(ne->block_addr) ||
nat_get_version(e) != ne->version);
}
}
diff --git a/fs/f2fs/node.h b/fs/f2fs/node.h
index 868bec65e..cfdcf9851 100644
--- a/fs/f2fs/node.h
+++ b/fs/f2fs/node.h
@@ -313,7 +313,7 @@ static inline bool is_recoverable_dnode(struct page *page)
((unsigned char *)ckpt + crc_offset)));
cp_ver |= (crc << 32);
}
- return cpu_to_le64(cp_ver) == cpver_of_node(page);
+ return cp_ver == cpver_of_node(page);
}
/*