From d396042cea7c60e2a13893631ea458eb36ab1106 Mon Sep 17 00:00:00 2001
From: yury <yury>
Date: Mon, 28 Feb 2005 16:17:26 +0000
Subject: [PATCH] - fixed ROOT setting up. If it is not empty, it should not be
 rewritten by "/r".

---
 lustre/mds/mds_reint.c         | 2 +-
 lustre/tests/test-framework.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lustre/mds/mds_reint.c b/lustre/mds/mds_reint.c
index 5eefba5..4f2e7fd 100644
--- a/lustre/mds/mds_reint.c
+++ b/lustre/mds/mds_reint.c
@@ -702,7 +702,7 @@ static int mds_reint_create(struct mds_update_record *rec, int offset,
 
                         rc = vfs_mkdir(dir, dchild, rec->ur_mode);
                         if (rc) {
-                                CERROR("Can't create dir %s, rc = %d\n",
+                                CERROR("Can't create dir \"%s\", rc = %d\n",
                                        dchild->d_name.name, rc);
                                 GOTO(cleanup, rc);
                         }
diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index c0f9c0f..c0f8ccd 100644
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -29,7 +29,7 @@ init_test_env() {
     export XMLCONFIG=${XMLCONFIG:-${TESTSUITE}.xml}
     export LTESTDIR=${LTESTDIR:-$LUSTRE/../ltest}
 
-    [ -d /r ] && export ROOT=/r
+    [ -d /r ] && test "x$ROOT" = "x" && export ROOT=/r
     export TMP=${TMP:-$ROOT/tmp}
 
     export PATH=:$PATH:$LUSTRE/utils:$LUSTRE/tests
-- 
1.8.3.1