Branch b1_5

diff --git a/lustre/ldlm/ldlm_lib.c b/lustre/ldlm/ldlm_lib.c
index a839917..21f8420 100644 (file)
--- a/lustre/ldlm/ldlm_lib.c
+++ b/lustre/ldlm/ldlm_lib.c
@@ -724,11 +724,10 @@ int target_handle_connect(struct ptlrpc_request *req, svc_handler_t handler)
          * drop any previous reference the request had, but we don't want
          * that to go to zero before we get our new export reference. */
         export = class_conn2export(&conn);
-
-        /* It's possible that the connection fails if this target is shutting
-           down. */
-        if (!export)
+        if (!export) {
+                DEBUG_REQ(D_ERROR, req, "Missing export!\n");
                 GOTO(out, rc = -ENODEV);
+        }
 
         /* If the client and the server are the same node, we will already
          * have an export that really points to the client's DLM export,

diff --git a/lustre/tests/runtests b/lustre/tests/runtests
index 2b781a5..a9f8e23 100755 (executable)
--- a/lustre/tests/runtests
+++ b/lustre/tests/runtests
@@ -91,7 +91,7 @@ mkdir $DST || fail "can't mkdir $DST" 10
 # haven't changed in the last day (hopefully they don't change during test)
 FILES=`find $SRC -type f -mtime +1 -ctime +1 | head -n $COUNT`
 log "copying files from $SRC to $DST$SRC at `date`"
-tar cf - $FILES | tar xvf - -C $DST || fail "copying $SRC" 11
+tar cf - $FILES | tar xvf - -C $DST > /dev/null || fail "copying $SRC" 11
 
 log "comparing newly copied files at `date`"
 for f in $FILES; do