From 709edd7febe7831c01c406cc1552b7c288502a8b Mon Sep 17 00:00:00 2001 From: Niu Yawei Date: Fri, 9 Oct 2015 02:50:32 -0400 Subject: [PATCH] LU-7267 e2fsck: remove duplicated ea value size check Remove the duplicated ea value size check in check_ea_in_inode(). Add a regression test by modifying the test in f_valid_ea_in_inode: - Enable EA_INODE feature to the image; - Add a new file which has large xattr, so that this file has both extra space in inode and external inode for large ea. Signed-off-by: Niu Yawei Change-Id: I1c1a4c444ee61d8d7e26ea878bcef56471aa9c42 Reviewed-on: http://review.whamcloud.com/16779 Tested-by: Jenkins Reviewed-by: Andreas Dilger Tested-by: Andreas Dilger --- e2fsck/pass1.c | 7 ------- tests/f_valid_ea_in_inode/expect.1 | 2 +- tests/f_valid_ea_in_inode/image.gz | Bin 11873 -> 12131 bytes 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/e2fsck/pass1.c b/e2fsck/pass1.c index 9584a0c..ffdfc41 100644 --- a/e2fsck/pass1.c +++ b/e2fsck/pass1.c @@ -446,13 +446,6 @@ static void check_ea_in_inode(e2fsck_t ctx, struct problem_context *pctx) /* attribute len eats this space */ remain -= EXT2_EXT_ATTR_SIZE(entry->e_name_len); - /* check value size */ - if (entry->e_value_size > remain) { - pctx->num = entry->e_value_size; - problem = PR_1_ATTR_VALUE_SIZE; - goto fix; - } - if (entry->e_value_inum == 0) { /* check value size */ if (entry->e_value_size > remain) { diff --git a/tests/f_valid_ea_in_inode/expect.1 b/tests/f_valid_ea_in_inode/expect.1 index a4d6dd2..747e680 100644 --- a/tests/f_valid_ea_in_inode/expect.1 +++ b/tests/f_valid_ea_in_inode/expect.1 @@ -3,5 +3,5 @@ Pass 2: Checking directory structure Pass 3: Checking directory connectivity Pass 4: Checking reference counts Pass 5: Checking group summary information -test_filesys: 22/2048 files (0.0% non-contiguous), 2072/8192 blocks +test_filesys: 24/2048 files (0.0% non-contiguous), 2078/8192 blocks Exit status is 0 diff --git a/tests/f_valid_ea_in_inode/image.gz b/tests/f_valid_ea_in_inode/image.gz index e40f78310fa80eff0e9613d04c3bccb90b38d11c..9f91f61bf5c6f323e5555b62f1c2ac2a5313719c 100644 GIT binary patch literal 12131 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 literal 11873 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 A?*IS* -- 1.8.3.1