39 lines
1.2 KiB
Diff
39 lines
1.2 KiB
Diff
|
From 3dd9cc2b2411a691f321c01a91bcdac42d476150 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Qu Wenruo <wqu@suse.com>
|
||
|
|
Date: Wed, 14 Mar 2018 08:56:57 +0800
|
||
|
|
Subject: [PATCH] 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 <wqu@suse.com>
|
||
|
|
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
||
|
|
---
|
||
|
|
Upstream status: https://patchwork.kernel.org/patch/10281327/ (applied; not
|
||
|
|
yet in git)
|
||
|
|
|
||
|
|
convert/source-ext2.c | 3 +--
|
||
|
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/convert/source-ext2.c b/convert/source-ext2.c
|
||
|
|
index b1492c78693d..070126ec38ec 100644
|
||
|
|
--- a/convert/source-ext2.c
|
||
|
|
+++ b/convert/source-ext2.c
|
||
|
|
@@ -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;
|
||
|
|
}
|
||
|
|
--
|
||
|
|
2.16.2
|
||
|
|
|