Revert "xfstests: resolve symlinked devices to real paths"

This reverts commit d5ea873fcbf00b841f0511a26fb341364a5c6425 which overrode
0a818862bb74932e15971ec8bedb55765ec3a3f6 xfstests: support post-udev device
mapper node.

Signed-off-by: Rich Johnston <rjohnston@sgi.com>
Reviewed-by: Rich Johnston <rjohnston@sgi.com>

diff --git a/common.config b/common.config
index 585b15050b59560ebaae9b2e2a06f1cf79bf3f36..57f505de62d5f74669c5505288551592bb759e75 100644 (file)
--- a/common.config
+++ b/common.config
@@ -220,15 +220,6 @@ else
     known_hosts
 fi
 
-# Scripts just don't deal well with symlinked devices
-if [ -L $TEST_DEV ]; then
-        TEST_DEV=`src/realpath $TEST_DEV`
-fi
-
-if [ -L $SCRATCH_DEV ]; then
-        SCRATCH_DEV=`src/realpath $SCRATCH_DEV`
-fi
-
 echo $TEST_DEV | grep -q ":" > /dev/null 2>&1
 if [ ! -b "$TEST_DEV" -a "$?" != "0" ]; then
     echo "common.config: Error: \$TEST_DEV ($TEST_DEV) is not a block device or a NFS filesystem"

diff --git a/src/realpath.c b/src/realpath.c
deleted file mode 100644 (file)
index 997b1aa..0000000
--- a/src/realpath.c
+++ /dev/null
@@ -1,32 +0,0 @@
-#include <limits.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-/*
- * Simple wrapper around realpath(3) to get absolute path
- * to a device name; many xfstests scripts don't cope well
- * with symlinked devices due to differences in /proc/mounts,
- * /etc/mtab, mount output, etc.
- */
-
-int main(int argc, char *argv[])
-{
-       char path[PATH_MAX];
-       char resolved_path[PATH_MAX];
-
-       if (argc != 2) {
-               printf("Usage: %s <filename>\n", argv[0]);
-               return 1;
-       }
-
-       strncpy(path, argv[1], PATH_MAX-1);
-
-       if (!realpath(path, resolved_path)) {
-               perror("Failed to resolve path for %s");
-               return 1;
-       }
-
-       printf("%s\n", resolved_path);
-       return 0;
-}