From 09fbe0fb330ef8cd851b6044cf5333a138b79074 Mon Sep 17 00:00:00 2001 From: Eric Sandeen Date: Thu, 28 Feb 2008 13:22:12 -0600 Subject: [PATCH] Add regression test for resize2fs moving inodes with inline xattrs The image contains an inode past the resize point with an inline xattr value of "propervalue". It also contains deleted inodes which had the xattr value "oldvalue". When resize2fs moves the inode, it should copy the xattr as well, so that post-resize we see "propervalue" not "oldvalue". Signed-off-by: Eric Sandeen Signed-off-by: "Theodore Ts'o" --- tests/r_inline_xattr/expect | 16 ++++++++++++ tests/r_inline_xattr/image.gz | Bin 0 -> 18907 bytes tests/r_inline_xattr/name | 1 + tests/r_inline_xattr/script | 55 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 72 insertions(+) create mode 100644 tests/r_inline_xattr/expect create mode 100644 tests/r_inline_xattr/image.gz create mode 100644 tests/r_inline_xattr/name create mode 100644 tests/r_inline_xattr/script diff --git a/tests/r_inline_xattr/expect b/tests/r_inline_xattr/expect new file mode 100644 index 0000000..f72ce87 --- /dev/null +++ b/tests/r_inline_xattr/expect @@ -0,0 +1,16 @@ +resize2fs test +debugfs -R ''stat file'' ./test.img 2>&1 | grep ''^Inode\|in inode body\|name = '' +Inode: 1550 Type: regular Mode: 0644 Flags: 0x0 Generation: 3498507810 +Extended attributes stored in inode body: + name = "propervalue" (11) +Exit status is 0 +resize2fs ./test.img 5M +Resizing the filesystem on ./test.img to 5120 (1k) blocks. +The filesystem on ./test.img is now 5120 blocks long. + +Exit status is 0 +debugfs -R ''stat file'' ./test.img 2>&1 | grep ''^Inode\|in inode body\|name = '' +Inode: 12 Type: regular Mode: 0644 Flags: 0x0 Generation: 3498507810 +Extended attributes stored in inode body: + name = "propervalue" (11) +Exit status is 0 diff --git a/tests/r_inline_xattr/image.gz b/tests/r_inline_xattr/image.gz new file mode 100644 index 0000000000000000000000000000000000000000..ead286932427db342ca4e9858b00a60f243b5a54 GIT binary patch literal 18907 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 GRsRR=mTva| literal 0 HcmV?d00001 diff --git a/tests/r_inline_xattr/name b/tests/r_inline_xattr/name new file mode 100644 index 0000000..97654fb --- /dev/null +++ b/tests/r_inline_xattr/name @@ -0,0 +1 @@ +shrinking filesystem with in-inode extended attributes diff --git a/tests/r_inline_xattr/script b/tests/r_inline_xattr/script new file mode 100644 index 0000000..eb923de --- /dev/null +++ b/tests/r_inline_xattr/script @@ -0,0 +1,55 @@ +if test -x $RESIZE2FS_EXE; then + +IMAGE=$test_dir/image.gz +FSCK_OPT=-yf +OUT=$test_name.log +EXP=$test_dir/expect + +gunzip < $IMAGE > $TMPFILE + +echo "resize2fs test" > $OUT + +# Look at existing inline extended attribute +echo "debugfs -R ''stat file'' $TMPFILE 2>&1 | grep ''^Inode\|in inode body\|name = ''" >> $OUT +$DEBUGFS -R "stat file" $TMPFILE 2>&1 | grep "^Inode\|in inode body\|name = " >> $OUT +status=$? +echo Exit status is $status >> $OUT + +# resize it +echo "resize2fs $TMPFILE 5M" >> $OUT +$RESIZE2FS $TMPFILE 5M 2>&1 >> $OUT.new 2>&1 +status=$? +echo Exit status is $status >> $OUT.new +sed -e '1d' $OUT.new >> $OUT + +# Look at inline extended attribute in resized fs +echo "debugfs -R ''stat file'' $TMPFILE 2>&1 | grep ''^Inode\|in inode body\|name = ''" >> $OUT +$DEBUGFS -R "stat file" $TMPFILE 2>&1 | grep "^Inode\|in inode body\|name = " >> $OUT +status=$? +echo Exit status is $status >> $OUT + +rm $TMPFILE $OUT.new + +# +# Do the verification +# + +rm -f $test_name.ok $test_name.failed +cmp -s $OUT $EXP +status=$? + +if [ "$status" = 0 ] ; then + echo "ok" + touch $test_name.ok +else + echo "failed" + diff $DIFF_OPTS $EXP $OUT > $test_name.failed +fi + +unset IMAGE FSCK_OPT OUT EXP + +else #if test -x $RESIZE2FS; then + rm -f $test_name.ok $test_name.failed + echo "skipped" +fi + -- 1.8.3.1