linux-xfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Marco Benatto <mbenatto@redhat.com>
To: fstests@vger.kernel.org
Cc: linux-xfs@vger.kernel.org, mbenatto@redhat.com,
	darrick.wong@oracle.com, sandeen@redhat.com
Subject: [PATCH 1/2] common/xfs: Add _scratch_get_sfdir_prefix function
Date: Mon, 18 Jun 2018 14:44:32 -0300	[thread overview]
Message-ID: <20180618174433.3069-1-mbenatto@redhat.com> (raw)

Move get_sfdir_prefix function from xfs/278 to commom/xfs
and rename it to _scratch_get_sfdir_prefix so it can be
used in other xfs tests.

This commit also changes xfs/278 to make use of
_scratch_get_sfdir_prefix instead previous one.

Signed-off-by: Marco Benatto <mbenatto@redhat.com>
---
 common/xfs    | 15 +++++++++++++++
 tests/xfs/278 | 16 +---------------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/common/xfs b/common/xfs
index 55cfa94..ecf54bb 100644
--- a/common/xfs
+++ b/common/xfs
@@ -760,3 +760,18 @@ _require_xfs_spaceman_command()
 			_notrun "xfs_spaceman $command doesn't support $param"
 	fi
 }
+
+_scratch_get_sfdir_prefix() {
+	local dir_ino="$1"
+
+	for prefix in "u.sfdir3" "u.sfdir2" "u3.sfdir3"; do
+		if [ -n "$(_scratch_xfs_get_metadata_field \
+				"${prefix}.hdr.parent.i4" \
+				"inode ${dir_ino}")" ]; then
+			echo "${prefix}"
+			return 0
+		fi
+	done
+	_scratch_xfs_db -c "inode ${dir_ino}" -c 'p' >> $seqres.full
+	return 1
+}
diff --git a/tests/xfs/278 b/tests/xfs/278
index 3d2a846..c208e61 100755
--- a/tests/xfs/278
+++ b/tests/xfs/278
@@ -46,25 +46,11 @@ _scratch_unmount
 
 echo "Silence is goodness..."
 
-get_sfdir_prefix() {
-	local dir_ino="$1"
-
-	for prefix in "u.sfdir3" "u.sfdir2" "u3.sfdir3"; do
-		if [ -n "$(_scratch_xfs_get_metadata_field \
-				"${prefix}.hdr.parent.i4" \
-				"inode ${dir_ino}")" ]; then
-			echo "${prefix}"
-			return 0
-		fi
-	done
-	_scratch_xfs_db -c "inode ${dir_ino}" -c 'p' >> $seqres.full
-	return 1
-}
 set_ifield() {
 	_scratch_xfs_set_metadata_field "$1" 0 "inode $2" >> $seqres.full
 }
 
-sfdir_prefix="$(get_sfdir_prefix "$DIR_INO" || \
+sfdir_prefix="$(_scratch_get_sfdir_prefix "$DIR_INO" || \
 	_fail "Cannot determine sfdir prefix")"
 
 # Corrupt DIR
-- 
2.9.5


             reply	other threads:[~2018-06-18 17:44 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-06-18 17:44 Marco Benatto [this message]
2018-06-18 17:44 ` [PATCH 2/2] xfstests: Test root inode parent pointer repairing Marco Benatto
2018-06-18 19:26   ` Darrick J. Wong
2018-06-20  1:48   ` Dave Chinner
2018-06-22  2:37   ` Eryu Guan
2018-06-22  2:58     ` Eric Sandeen
2018-06-22  3:54       ` Dave Chinner
2018-06-22 15:17         ` Marco Benatto
2018-06-22 18:04           ` Marco Benatto
2018-06-18 19:11 ` [PATCH 1/2] common/xfs: Add _scratch_get_sfdir_prefix function Darrick J. Wong

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180618174433.3069-1-mbenatto@redhat.com \
    --to=mbenatto@redhat.com \
    --cc=darrick.wong@oracle.com \
    --cc=fstests@vger.kernel.org \
    --cc=linux-xfs@vger.kernel.org \
    --cc=sandeen@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).