Merge of xfs-cmds-2.4.18:slinx:112561a by nathans.

  rediff after AndreasG reworked the way directory descent is done & use of
  nftw (symlinks esp. affected, but in a good way).

diff --git a/062.out b/062.out
index 8fee454e8f4ce85488d5d23e4b68cc44dd2660e7..1af2651b54a751218e0fc4b5759958206582035c 100644 (file)
--- a/062.out
+++ b/062.out
@@ -622,12 +622,6 @@ user.name3=0xdeface
 xfsroot.name=0xbabe
 xfsroot.name3=0xdeface
 
-# file: SCRATCH_MNT/lnk
-user.name=0xbabe
-user.name3=0xdeface
-xfsroot.name=0xbabe
-xfsroot.name3=0xdeface
-
 # file: SCRATCH_MNT/dev/b
 user.name=0xbabe
 user.name3=0xdeface
@@ -670,10 +664,6 @@ user.x=0x797a
 user.1=0x3233
 user.x=0x797a
 
-# file: SCRATCH_MNT/descend/and/ascend
-xfsroot.9=0x3837
-xfsroot.a=0x6263
-
 
 *** directory descent without following symlinks
 # file: SCRATCH_MNT/reg