0003-btrfs-progs-convert-ext2-Remove-check-for-ext2_ext_a.patch 1.2 KB

1234567891011121314151617181920212223242526272829303132333435363738
  1. From 3dd9cc2b2411a691f321c01a91bcdac42d476150 Mon Sep 17 00:00:00 2001
  2. From: Qu Wenruo <wqu@suse.com>
  3. Date: Wed, 14 Mar 2018 08:56:57 +0800
  4. Subject: [PATCH] btrfs-progs: convert/ext2: Remove check for
  5. ext2_ext_attr_entry->e_value_block
  6. In latest e2fsprogs (1.44.0) definition of ext2_ext_attr_entry has
  7. removed member e_value_block, as currently ext* doesn't support it set
  8. anyway.
  9. So remove such check so that we can pass compile.
  10. Signed-off-by: Qu Wenruo <wqu@suse.com>
  11. Signed-off-by: Baruch Siach <baruch@tkos.co.il>
  12. ---
  13. Upstream status: https://patchwork.kernel.org/patch/10281327/ (applied; not
  14. yet in git)
  15. convert/source-ext2.c | 3 +--
  16. 1 file changed, 1 insertion(+), 2 deletions(-)
  17. diff --git a/convert/source-ext2.c b/convert/source-ext2.c
  18. index b1492c78693d..070126ec38ec 100644
  19. --- a/convert/source-ext2.c
  20. +++ b/convert/source-ext2.c
  21. @@ -422,8 +422,7 @@ static int ext2_xattr_check_entry(struct ext2_ext_attr_entry *entry,
  22. {
  23. size_t value_size = entry->e_value_size;
  24. - if (entry->e_value_block != 0 || value_size > size ||
  25. - entry->e_value_offs + value_size > size)
  26. + if (value_size > size || entry->e_value_offs + value_size > size)
  27. return -EIO;
  28. return 0;
  29. }
  30. --
  31. 2.16.2