Skip to contentSkip to conversation

f2fs: le16_to_cpu for xattr->e_value_size

PATCH In review Jaegeuk Kim 2 participants 3 messages Mar 10, 2017 – Mar 11, 2017

Subsystems (2)
VFS F2FS file system
lore
Share & tools
lore

Jaegeuk Kim

author maintainer
#0 lore raw

PATCH 1/2 f2fs: le16_to_cpu for xattr->e_value_size

This patch fixes missing le16 conversion, reported by kbuild test robot.

Fixes 5f35a2cd5 ("f2fs: Don't update the xattr data that same as the exist")
Signed-off-by Jaegeuk Kim <[email protected]>
---
 fs/f2fs/xattr.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
fs/f2fs/xattr.c +3 -1
index 7298a4488f7f..aff7619e3f96 100644
@@ -546,7 +546,9 @@ static bool f2fs_xattr_value_same(struct f2fs_xattr_entry *entry,
 					const void *value, size_t size)
 {
 	void *pval = entry->e_name + entry->e_name_len;
-	return (entry->e_value_size == size) && !memcmp(pval, value, size);
+
+	return (le16_to_cpu(entry->e_value_size) == size) &&
+					!memcmp(pval, value, size);
 }
 
 static int __f2fs_setxattr(struct inode *inode, int index,
Signature · 1 line
2.11.0
author maintainer
#1 lore raw

PATCH 2/2 f2fs: declare static functions

This is to avoid build warning reported by kbuild test robot.

Signed-off-by Fengguang Wu <[email protected]>
Signed-off-by Jaegeuk Kim <[email protected]>
---
 fs/f2fs/node.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
fs/f2fs/node.c +4 -3
index 94967171dee8..a0a060c2979b 100644
@@ -1823,7 +1823,8 @@ static void remove_free_nid(struct f2fs_sb_info *sbi, nid_t nid)
 		kmem_cache_free(free_nid_slab, i);
 }
 
-void update_free_nid_bitmap(struct f2fs_sb_info *sbi, nid_t nid, bool set)
+static void update_free_nid_bitmap(struct f2fs_sb_info *sbi, nid_t nid,
+					bool set)
 {
 	struct f2fs_nm_info *nm_i = NM_I(sbi);
 	unsigned int nat_ofs = NAT_BLOCK_OFFSET(nid);

@@ -2383,7 +2384,7 @@ static void __adjust_nat_entry_set(struct nat_entry_set *nes,
 	list_add_tail(&nes->set_list, head);
 }
 
-void __update_nat_bits(struct f2fs_sb_info *sbi, nid_t start_nid,
+static void __update_nat_bits(struct f2fs_sb_info *sbi, nid_t start_nid,
 						struct page *page)
 {
 	struct f2fs_nm_info *nm_i = NM_I(sbi);

@@ -2638,7 +2639,7 @@ static int init_node_manager(struct f2fs_sb_info *sbi)
 	return 0;
 }
 
-int init_free_nid_cache(struct f2fs_sb_info *sbi)
+static int init_free_nid_cache(struct f2fs_sb_info *sbi)
 {
 	struct f2fs_nm_info *nm_i = NM_I(sbi);
Signature · 1 line
2.11.0
Reviewed-by on v1 1/2
#2 lore raw
In reply to Jaegeuk Kim
Quoted 4 lines · Jaegeuk Kim

This patch fixes missing le16 conversion, reported by kbuild test robot.

Fixes 5f35a2cd5 ("f2fs: Don't update the xattr data that same as the exist")
Signed-off-by Jaegeuk Kim <[email protected]>
Reviewed-by Kinglong Mee <[email protected]>
Quoted 20 lines
---
 fs/f2fs/xattr.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
fs/f2fs/xattr.c +3 -1
index 7298a4488f7f..aff7619e3f96 100644
@@ -546,7 +546,9 @@ static bool f2fs_xattr_value_same(struct f2fs_xattr_entry *entry,
 					const void *value, size_t size)
 {
 	void *pval = entry->e_name + entry->e_name_len;
-	return (entry->e_value_size == size) && !memcmp(pval, value, size);
+
+	return (le16_to_cpu(entry->e_value_size) == size) &&
+					!memcmp(pval, value, size);
 }
 
 static int __f2fs_setxattr(struct inode *inode, int index,