[2/3] overlay/018: Add constant d_ino test

Commit Message

Chandan Rajendra Nov. 18, 2017, 5:58 a.m. UTC

Constant d_ino for hardlinks is possible only when "index" config
feature/mount option is enabled.

Signed-off-by: Chandan Rajendra <[e-mail]>
---
 tests/overlay/018 | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

Comments

Amir Goldstein Nov. 18, 2017, 8:35 p.m. UTC | #1

On Sat, Nov 18, 2017 at 7:58 AM, Chandan Rajendra
<[e-mail]> wrote:
> Constant d_ino for hardlinks is possible only when "index" config
> feature/mount option is enabled.
>
> Signed-off-by: Chandan Rajendra <[e-mail]>

Looks good and tested.

Thanks,
Amir.
--
To unsubscribe from this list: send the line "unsubscribe fstests" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/tests/overlay/018 b/tests/overlay/018
index a4f67d1..6e026c1 100755
--- a/tests/overlay/018
+++ b/tests/overlay/018
@@ -50,6 +50,7 @@  _supported_fs overlay
 _supported_os Linux
 _require_scratch
 _require_scratch_feature index
+_require_test_program "t_dir_type"
 
 rm -f $seqres.full
 
@@ -65,14 +66,15 @@  ln $lowerdir/foo $lowerdir/bar
 # Record inode numbers in format <ino> <nlink>
 function record_ino_nlink()
 {
-	ls -li $FILES | awk '{ print $1, $3 }' > $1
+	ls -li $FILES | awk '{ print $1, $3, $10}' > $1
 }
 
 # Check inode numbers match recorded inode numbers
 function check_ino_nlink()
 {
-	before=$1
-	after=$2
+	dir=$1
+	before=$2
+	after=$3
 
 	record_ino_nlink $after
 
@@ -80,6 +82,13 @@  function check_ino_nlink()
 	#   Compare before..after - expect silence
 	# We use diff -u so out.bad will tell us which stage failed
 	diff -u $before $after
+
+	# Test constant readdir(3)/getdents(2) d_ino -
+	#   Expect to find file by inode number
+	cat $before | while read ino nlink f; do
+		$here/src/t_dir_type $dir $ino | grep -q $(basename $f) || \
+			echo "$(basename $f) not found by ino $ino (from $before)"
+	done
 }
 
 # Enable overlay index feature to prevent breaking hardlinks on copy up
@@ -104,14 +113,14 @@  echo "one" >> $bar
 
 echo "== After write one =="
 cat $FILES
-check_ino_nlink $tmp.before $tmp.after_one
+check_ino_nlink $SCRATCH_MNT $tmp.before $tmp.after_one
 
 # Verify that the hardlinks survive a mount cycle
 _scratch_cycle_mount index=on
 
 echo "== After mount cycle =="
 cat $FILES
-check_ino_nlink $tmp.after_one $tmp.after_cycle
+check_ino_nlink $SCRATCH_MNT $tmp.after_one $tmp.after_cycle
 
 # Drop caches to get the copied up hardlink out of cache
 echo 3 > /proc/sys/vm/drop_caches
@@ -121,7 +130,7 @@  echo "two" >> $foo
 
 echo "== After write two =="
 cat $FILES
-check_ino_nlink $tmp.after_one $tmp.after_two
+check_ino_nlink $SCRATCH_MNT $tmp.after_one $tmp.after_two
 
 status=0
 exit