apfs/apfstests
0
0
Fork 0
mirror of https://github.com/linux-apfs/apfstests.git synced 2026-05-01 15:01:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

overlay/038: code cleanup

Browse Source 
This commit implements similar changes made to overlay/041 test i.e.
- Remove duplicate merged dir tests
- Remove duplicate pure upper dir inside merged dir tests
- Sort out comments and error messages

Signed-off-by: Chandan Rajendra <chandan@linux.vnet.ibm.com>
Reviewed-by: Amir Goldstein <amir73il@gmail.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>
This commit is contained in:
Chandan Rajendra
2017-11-20 20:04:09 +05:30
committed by Eryu Guan
parent 1162f45f66
commit b689d3c8b0
1 changed files with 28 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/overlay/038
+28 -40
View File
@@ -59,32 +59,13 @@ upperdir=$OVL_BASE_SCRATCH_MNT/$OVL_UPPER
lowerdir=$OVL_BASE_SCRATCH_MNT/$OVL_LOWER
mkdir -p $lowerdir
mkdir $lowerdir/test_dir/
mkdir $lowerdir/test_dir/pure_lower_dir
mkdir $lowerdir/test_dir/merged_dir
mkdir -p $lowerdir/test_dir/pure_lower_dir
touch $lowerdir/test_file
_scratch_mount
test_dir=$SCRATCH_MNT/test_dir/
merged_dir=$test_dir/merged_dir
pure_upper_dir=$merged_dir/pure_upper_dir
mkdir -p $pure_upper_dir
merged_dir_st_ino=$(stat -c '%i' $merged_dir)
# Pure dir's parent d_ino must always be calculated because
# it can be residing inside a merged dir.
parent_d=$($here/src/t_dir_type $pure_upper_dir $merged_dir_st_ino)
[[ $parent_d == ".. d" ]] || \
echo "Pure dir inside a merged dir: Invalid d_ino reported for .."
# d_ino for "." must always be calculated because the present
# directory can have a copy-up origin.
current_d=$($here/src/t_dir_type $merged_dir $merged_dir_st_ino)
[[ $current_d == ". d" ]] || echo "Merged dir: Invalid d_ino reported for ."
# Verify d_ino of '.' and '..' before and after dir becomes impure.
impure_dir=$test_dir/impure_dir
@@ -96,12 +77,13 @@ impure_dir_parent_st_ino=$(stat -c '%i' $test_dir)
# Before $impure_dir becomes impure
parent_d=$($here/src/t_dir_type $impure_dir $impure_dir_parent_st_ino)
[[ $parent_d == ".. d" ]] || \
echo "Before dir becomes impure: Invalid d_ino reported for .."
echo "Pure upper dir: Invalid d_ino reported for .."
current_d=$($here/src/t_dir_type $impure_dir $impure_dir_st_ino)
[[ $current_d == ". d" ]] || \
echo "Before dir becomes impure: Invalid d_ino reported for ."
echo "Pure upper dir: Invalid d_ino reported for ."
# Move a copied up file into pure dir to make it impure
mv $SCRATCH_MNT/test_file $impure_dir
test_file_st_ino=$(stat -c '%i' $impure_dir/test_file)
@@ -112,11 +94,11 @@ impure=$($GETFATTR_PROG --absolute-names --only-values -n 'trusted.overlay.impur
# After $impure_dir becomes impure
parent_d=$($here/src/t_dir_type $impure_dir $impure_dir_parent_st_ino)
[[ $parent_d == ".. d" ]] || \
echo "After dir becomes impure: Invalid d_ino reported for .."
echo "Impure dir: Invalid d_ino reported for .."
current_d=$($here/src/t_dir_type $impure_dir $impure_dir_st_ino)
[[ $current_d == ". d" ]] || \
echo "After dir becomes impure: Invalid d_ino reported for ."
echo "Impure dir: Invalid d_ino reported for ."
# Verify copy up file's d_ino
file_d=$($here/src/t_dir_type $impure_dir $test_file_st_ino)
@@ -128,30 +110,35 @@ rm -rf $impure_dir/test_file
# Verify invalidation of readdir cache
$here/src/t_dir_type $impure_dir $test_file_st_ino
[[ $? != 0 ]] || echo "Directory's readdir cache has stale entries"
[[ $? != 0 ]] || echo "Directory's readdir cache has stale file entries"
impure=$($GETFATTR_PROG --absolute-names --only-values -n 'trusted.overlay.impure' \
$upperdir/test_dir/impure_dir 2>/dev/null)
[[ -z $impure ]] || echo "Pure directory has impure xattr"
# Verify d_ino values corresponding to "." and ".." entries of a
# pure lower dir.
parent_st_ino=$(stat -c '%i' $SCRATCH_MNT/test_dir)
# Verify d_ino of '.' and '..' before and after dir becomes merge dir.
parent_st_ino=$(stat -c '%i' $test_dir)
pure_lower_dir=$SCRATCH_MNT/test_dir/pure_lower_dir
parent_d=$($here/src/t_dir_type $pure_lower_dir $parent_st_ino)
[[ $parent_d == ".. d" ]] || echo "Pure lower dir: Invalid d_ino reported for .."
pure_lower_dir_st_ino=$(stat -c '%i' $pure_lower_dir)
parent_d=$($here/src/t_dir_type $pure_lower_dir $parent_st_ino)
[[ $parent_d == ".. d" ]] || \
echo "Pure lower dir: Invalid d_ino reported for .."
current_d=$($here/src/t_dir_type $pure_lower_dir $pure_lower_dir_st_ino)
[[ $current_d == ". d" ]] || echo "Pure lower dir: Invalid d_ino reported for ."
[[ $current_d == ". d" ]] || \
echo "Pure lower dir: Invalid d_ino reported for ."
# Verify d_ino of ".." entry of a merged dir.
merged_dir=$SCRATCH_MNT/test_dir/merged_dir
# Create a file in pure lower dir to make it a merge dir
touch $pure_lower_dir/newfile
parent_d=$($here/src/t_dir_type $merged_dir $parent_st_ino)
[[ $parent_d == ".. d" ]] || echo "Merged dir: Invalid d_ino reported for .."
parent_d=$($here/src/t_dir_type $pure_lower_dir $parent_st_ino)
[[ $parent_d == ".. d" ]] || \
echo "Merged dir: Invalid d_ino reported for .."
current_d=$($here/src/t_dir_type $pure_lower_dir $pure_lower_dir_st_ino)
[[ $current_d == ". d" ]] || \
echo "Merged dir: Invalid d_ino reported for ."
_scratch_unmount
@@ -177,11 +164,12 @@ mkdir -p $lowerdir/test_dir/pure_lower_dir
_overlay_scratch_mount_dirs "$middir:$lowerdir" $upperdir $workdir
# Copy up test_dir
touch $SCRATCH_MNT/test_dir/test_file
touch $test_dir/test_file
test_dir_st_ino=$(stat -c '%i' $SCRATCH_MNT/test_dir)
test_dir_st_ino=$(stat -c '%i' $test_dir)
pure_lower_dir=$test_dir/pure_lower_dir
parent_d=$($here/src/t_dir_type $SCRATCH_MNT/test_dir/pure_lower_dir $test_dir_st_ino)
parent_d=$($here/src/t_dir_type $pure_lower_dir $test_dir_st_ino)
[[ $parent_d == ".. d" ]] || \
echo "Pure lower in dir which has another lower layer: Invalid d_ino reported for .."