linux-xfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] common: new function to get real device path name and basename
@ 2014-04-22  3:27 Eryu Guan
  2014-04-22  5:10 ` Dave Chinner
  0 siblings, 1 reply; 4+ messages in thread
From: Eryu Guan @ 2014-04-22  3:27 UTC (permalink / raw)
  To: xfs; +Cc: Eryu Guan

If TEST_DEV or SCRATCH_DEV is symlink(mostly a lvm lv), a simple
basename is not enough, symlink should be followed.

This task is common enough, so introduce new helper functions and
replace all readlink calls in

ext4/305
generic/009
generic/019
generic/285
generic/312

Signed-off-by: Eryu Guan <eguan@redhat.com>
---
 common/rc         | 16 ++++++++++++++++
 tests/ext4/305    |  2 +-
 tests/generic/009 |  2 +-
 tests/generic/019 |  4 +---
 tests/generic/285 |  2 +-
 tests/generic/312 |  2 +-
 6 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/common/rc b/common/rc
index acf419b..68b040d 100644
--- a/common/rc
+++ b/common/rc
@@ -2302,6 +2302,22 @@ init_rc()
 	export XFS_IO_PROG="$XFS_IO_PROG -F"
 }
 
+# get real device path name by following link
+_real_dev()
+{
+	local _dev=$1
+	if [ -b "$_dev" ] && [ -L "$_dev" ]; then
+		_dev=`readlink -f "$_dev"`
+	fi
+	echo $_dev
+}
+
+# basename of a device
+_basename_dev()
+{
+	echo `basename $(_real_dev $1)`
+}
+
 init_rc
 
 ################################################################################
diff --git a/tests/ext4/305 b/tests/ext4/305
index eee461a..645f5c8 100755
--- a/tests/ext4/305
+++ b/tests/ext4/305
@@ -49,7 +49,7 @@ _require_scratch
 rm -f $seqres.full
 echo "Silence is golden"
 
-DEV_BASENAME=$(basename $(readlink -f $SCRATCH_DEV))
+DEV_BASENAME=$(_basename_dev $SCRATCH_DEV)
 echo "Start test on device $SCRATCH_DEV, basename $DEV_BASENAME" >$seqres.full
 _scratch_mkfs >>$seqres.full 2>&1
 
diff --git a/tests/generic/009 b/tests/generic/009
index b7b0b3f..0886594 100644
--- a/tests/generic/009
+++ b/tests/generic/009
@@ -50,7 +50,7 @@ testfile=$TEST_DIR/009.$$
 
 # Disable extent zeroing for ext4 as that change where holes are created
 if [ "$FSTYP" = "ext4" ]; then
-	DEV=`basename $TEST_DEV`
+	DEV=`_basename_dev $TEST_DEV`
 	echo 0 >/sys/fs/ext4/$DEV/extent_max_zeroout_kb
 fi
 
diff --git a/tests/generic/019 b/tests/generic/019
index 1208c49..8c37a31 100755
--- a/tests/generic/019
+++ b/tests/generic/019
@@ -41,9 +41,7 @@ _need_to_be_root
 _require_scratch
 _require_fail_make_request
 
-# TODO: Function are common enough to be moved to common/blkdev
-SCRATCH_REAL_DEV=`readlink -f $SCRATCH_DEV`
-SCRATCH_BDEV=`basename $SCRATCH_REAL_DEV`
+SCRATCH_BDEV=`_basename_dev $SCRATCH_DEV`
 
 allow_fail_make_request()
 {
diff --git a/tests/generic/285 b/tests/generic/285
index 8078b1c..8826023 100755
--- a/tests/generic/285
+++ b/tests/generic/285
@@ -48,7 +48,7 @@ BASE_TEST_FILE=$TEST_DIR/seek_sanity_testfile
 
 # Disable extent zeroing for ext4 as that change where holes are created
 if [ "$FSTYP" = "ext4" ]; then
-	DEV=`basename $TEST_DEV`
+	DEV=`_basename_dev $TEST_DEV`
 	echo 0 >/sys/fs/ext4/$DEV/extent_max_zeroout_kb
 fi
 
diff --git a/tests/generic/312 b/tests/generic/312
index eaec43c..a81b0df 100755
--- a/tests/generic/312
+++ b/tests/generic/312
@@ -52,7 +52,7 @@ _require_scratch
 # 5G in byte
 fssize=$((2**30 * 5))
 required_blocks=$(($fssize / 1024))
-dev_blocks=$(grep $(basename $(readlink -f $SCRATCH_DEV)) /proc/partitions | $AWK_PROG '{print $3}')
+dev_blocks=$(grep $(_basename_dev $SCRATCH_DEV) /proc/partitions | $AWK_PROG '{print $3}')
 if [ $required_blocks -gt $dev_blocks ];then
 	_notrun "this test requires \$SCRATCH_DEV has ${fssize}B space"
 fi
-- 
1.9.0

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* Re: [PATCH] common: new function to get real device path name and basename
  2014-04-22  3:27 [PATCH] common: new function to get real device path name and basename Eryu Guan
@ 2014-04-22  5:10 ` Dave Chinner
  2014-04-22  6:57   ` [PATCH v2] " Eryu Guan
  0 siblings, 1 reply; 4+ messages in thread
From: Dave Chinner @ 2014-04-22  5:10 UTC (permalink / raw)
  To: Eryu Guan; +Cc: xfs

On Tue, Apr 22, 2014 at 11:27:27AM +0800, Eryu Guan wrote:
> If TEST_DEV or SCRATCH_DEV is symlink(mostly a lvm lv), a simple
> basename is not enough, symlink should be followed.
> 
> This task is common enough, so introduce new helper functions and
> replace all readlink calls in
> 
> ext4/305
> generic/009
> generic/019
> generic/285
> generic/312
> 
> Signed-off-by: Eryu Guan <eguan@redhat.com>
> ---
>  common/rc         | 16 ++++++++++++++++
>  tests/ext4/305    |  2 +-
>  tests/generic/009 |  2 +-
>  tests/generic/019 |  4 +---
>  tests/generic/285 |  2 +-
>  tests/generic/312 |  2 +-
>  6 files changed, 21 insertions(+), 7 deletions(-)
> 
> diff --git a/common/rc b/common/rc
> index acf419b..68b040d 100644
> --- a/common/rc
> +++ b/common/rc
> @@ -2302,6 +2302,22 @@ init_rc()
>  	export XFS_IO_PROG="$XFS_IO_PROG -F"
>  }
>  
> +# get real device path name by following link
> +_real_dev()
> +{
> +	local _dev=$1
> +	if [ -b "$_dev" ] && [ -L "$_dev" ]; then
> +		_dev=`readlink -f "$_dev"`
> +	fi
> +	echo $_dev
> +}
> +
> +# basename of a device
> +_basename_dev()
> +{
> +	echo `basename $(_real_dev $1)`
> +}

I don't really like that function name.  It describes the
implementation, not what the function actually returns. i.e. we're
getting the -short- device names here, basename is the implemenation
used to turn a full device name to a short device name...

Cheers,

Dave
-- 
Dave Chinner
david@fromorbit.com

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

^ permalink raw reply	[flat|nested] 4+ messages in thread
* [PATCH v2] common: new function to get real device path name and basename
  2014-04-22  5:10 ` Dave Chinner
@ 2014-04-22  6:57   ` Eryu Guan
  2014-04-25  6:30     ` Christoph Hellwig
  0 siblings, 1 reply; 4+ messages in thread
From: Eryu Guan @ 2014-04-22  6:57 UTC (permalink / raw)
  To: xfs; +Cc: Eryu Guan

If TEST_DEV or SCRATCH_DEV is symlink(mostly a lvm lv), a simple
basename is not enough, symlink should be followed.

This task is common enough, so introduce new helper functions and
replace all readlink calls in

ext4/305
generic/009
generic/019
generic/285
generic/312

Signed-off-by: Eryu Guan <eguan@redhat.com>
---
v2: rename _basename_dev to _short_dev as Dave suggested

 common/rc         | 16 ++++++++++++++++
 tests/ext4/305    |  2 +-
 tests/generic/009 |  2 +-
 tests/generic/019 |  4 +---
 tests/generic/285 |  2 +-
 tests/generic/312 |  2 +-
 6 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/common/rc b/common/rc
index acf419b..f16328d 100644
--- a/common/rc
+++ b/common/rc
@@ -2302,6 +2302,22 @@ init_rc()
 	export XFS_IO_PROG="$XFS_IO_PROG -F"
 }
 
+# get real device path name by following link
+_real_dev()
+{
+	local _dev=$1
+	if [ -b "$_dev" ] && [ -L "$_dev" ]; then
+		_dev=`readlink -f "$_dev"`
+	fi
+	echo $_dev
+}
+
+# basename of a device
+_short_dev()
+{
+	echo `basename $(_real_dev $1)`
+}
+
 init_rc
 
 ################################################################################
diff --git a/tests/ext4/305 b/tests/ext4/305
index eee461a..860d0a6 100755
--- a/tests/ext4/305
+++ b/tests/ext4/305
@@ -49,7 +49,7 @@ _require_scratch
 rm -f $seqres.full
 echo "Silence is golden"
 
-DEV_BASENAME=$(basename $(readlink -f $SCRATCH_DEV))
+DEV_BASENAME=$(_short_dev $SCRATCH_DEV)
 echo "Start test on device $SCRATCH_DEV, basename $DEV_BASENAME" >$seqres.full
 _scratch_mkfs >>$seqres.full 2>&1
 
diff --git a/tests/generic/009 b/tests/generic/009
index b7b0b3f..aa662b2 100644
--- a/tests/generic/009
+++ b/tests/generic/009
@@ -50,7 +50,7 @@ testfile=$TEST_DIR/009.$$
 
 # Disable extent zeroing for ext4 as that change where holes are created
 if [ "$FSTYP" = "ext4" ]; then
-	DEV=`basename $TEST_DEV`
+	DEV=`_short_dev $TEST_DEV`
 	echo 0 >/sys/fs/ext4/$DEV/extent_max_zeroout_kb
 fi
 
diff --git a/tests/generic/019 b/tests/generic/019
index 1208c49..7a019ad 100755
--- a/tests/generic/019
+++ b/tests/generic/019
@@ -41,9 +41,7 @@ _need_to_be_root
 _require_scratch
 _require_fail_make_request
 
-# TODO: Function are common enough to be moved to common/blkdev
-SCRATCH_REAL_DEV=`readlink -f $SCRATCH_DEV`
-SCRATCH_BDEV=`basename $SCRATCH_REAL_DEV`
+SCRATCH_BDEV=`_short_dev $SCRATCH_DEV`
 
 allow_fail_make_request()
 {
diff --git a/tests/generic/285 b/tests/generic/285
index 8078b1c..ac34d34 100755
--- a/tests/generic/285
+++ b/tests/generic/285
@@ -48,7 +48,7 @@ BASE_TEST_FILE=$TEST_DIR/seek_sanity_testfile
 
 # Disable extent zeroing for ext4 as that change where holes are created
 if [ "$FSTYP" = "ext4" ]; then
-	DEV=`basename $TEST_DEV`
+	DEV=`_short_dev $TEST_DEV`
 	echo 0 >/sys/fs/ext4/$DEV/extent_max_zeroout_kb
 fi
 
diff --git a/tests/generic/312 b/tests/generic/312
index eaec43c..eb6cec9 100755
--- a/tests/generic/312
+++ b/tests/generic/312
@@ -52,7 +52,7 @@ _require_scratch
 # 5G in byte
 fssize=$((2**30 * 5))
 required_blocks=$(($fssize / 1024))
-dev_blocks=$(grep $(basename $(readlink -f $SCRATCH_DEV)) /proc/partitions | $AWK_PROG '{print $3}')
+dev_blocks=$(grep $(_short_dev $SCRATCH_DEV) /proc/partitions | $AWK_PROG '{print $3}')
 if [ $required_blocks -gt $dev_blocks ];then
 	_notrun "this test requires \$SCRATCH_DEV has ${fssize}B space"
 fi
-- 
1.9.0

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* Re: [PATCH v2] common: new function to get real device path name and basename
  2014-04-22  6:57   ` [PATCH v2] " Eryu Guan
@ 2014-04-25  6:30     ` Christoph Hellwig
  0 siblings, 0 replies; 4+ messages in thread
From: Christoph Hellwig @ 2014-04-25  6:30 UTC (permalink / raw)
  To: Eryu Guan; +Cc: xfs

Looks good,

Reviewed-by: Christoph Hellwig <hch@lst.de>

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-04-25  6:30 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-04-22  3:27 [PATCH] common: new function to get real device path name and basename Eryu Guan
2014-04-22  5:10 ` Dave Chinner
2014-04-22  6:57   ` [PATCH v2] " Eryu Guan
2014-04-25  6:30     ` Christoph Hellwig

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).