xfs
[Top] [All Lists]

[PATCH] Fix _require_scratch test for extN, resierfs, gfs2, and btrfs

To: xfs@xxxxxxxxxxx
Subject: [PATCH] Fix _require_scratch test for extN, resierfs, gfs2, and btrfs
From: "Theodore Ts'o" <tytso@xxxxxxx>
Date: Fri, 19 Jun 2009 16:28:21 -0400
Cc: felixb@xxxxxxx, "Theodore Ts'o" <tytso@xxxxxxx>
In-reply-to: <7D909252-70A0-44C2-A5D7-D56A4B6CD244@xxxxxxx>
References: <7D909252-70A0-44C2-A5D7-D56A4B6CD244@xxxxxxx>
The extN, reiserfs, gfs2, and btrfs filesysytem types should use the
same check for a block device as XFS and UDF, and not the test for
NFS, which was checking for host:/foo/bar/baz when checking for a
scratch device.

Also, the NFS logic was also incorrect, in that it would allow a
zero-length SCRATCH_DEV to continue.

Signed-off-by: "Theodore Ts'o" <tytso@xxxxxxx>
---

Oops, I sent the wrong version of the patch earlier.  Sorry about that!!

                                  - Ted
 common.rc |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common.rc b/common.rc
index 581cfba..cfab2cd 100644
--- a/common.rc
+++ b/common.rc
@@ -593,7 +593,7 @@ _supported_os()
 _require_scratch()
 {
     case "$FSTYP" in
-       xfs|udf)
+       xfs|udf|ext2|ext3|ext4|reiserfs|gfs2|btrfs)
                 if [ -z "$SCRATCH_DEV" -o "`_is_block_dev $SCRATCH_DEV`" = "" ]
                 then
                     _notrun "this test requires a valid \$SCRATCH_DEV"
@@ -603,9 +603,9 @@ _require_scratch()
                     _notrun "this test requires a valid \$SCRATCH_DEV"
                 fi
                 ;;
-       nfs*|ext2|ext3|ext4|reiserfs|gfs2|btrfs)
+       nfs*)
                 echo $SCRATCH_DEV | grep -q ":" > /dev/null 2>&1
-                if [ ! -z "$SCRATCH_DEV" -a ! -b "$SCRATCH_DEV" -a "$?" != "0" 
]
+                if [ -z "$SCRATCH_DEV" -o "$?" != "0" ]
                 then
                     _notrun "this test requires a valid \$SCRATCH_DEV"
                 fi
-- 
1.6.3.2.1.gb9f7d.dirty

<Prev in Thread] Current Thread [Next in Thread>