Skip to contentSkip to conversation

btrfs-progs: convert/ext2: Remove check for ext2_ext_attr_entry->e_value_block

PATCH Applied Qu Wenruo 2 participants 2 messages Mar 14, 2018 – Mar 19, 2018 Btrfs file system

lore
Share & tools
lore

Qu Wenruo

author
#0 lore raw

PATCH 1/1 btrfs-progs: convert/ext2: Remove check for ext2_ext_attr_entry->e_value_block

In latest e2fsprogs (1.44.0) definition of ext2_ext_attr_entry has removed member e_value_block, as currently ext* doesn't support it set anyway.

So remove such check so that we can pass compile.

Signed-off-by Qu Wenruo <[email protected]>

---
Fast rolling distribution (Arch) catches this much faster.

---
 convert/source-ext2.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
convert/source-ext2.c +1 -2
index b1492c78693d..070126ec38ec 100644
@@ -422,8 +422,7 @@ static int ext2_xattr_check_entry(struct ext2_ext_attr_entry *entry,
 {
 	size_t value_size = entry->e_value_size;
 
-	if (entry->e_value_block != 0 || value_size > size ||
-	    entry->e_value_offs + value_size > size)
+	if (value_size > size || entry->e_value_offs + value_size > size)
 		return -EIO;
 	return 0;
 }
Signature · 1 line
2.16.2
Applied
#1 lore raw
Quoted 7 lines · Qu Wenruo

In latest e2fsprogs (1.44.0) definition of ext2_ext_attr_entry has removed member e_value_block, as currently ext* doesn't support it set anyway.

So remove such check so that we can pass compile.

Signed-off-by Qu Wenruo <[email protected]>

Applied, thanks.