branch: b_new_cmd

port from b1_8_gss: various trivial fixes.

diff --git a/lustre/ldlm/ldlm_lockd.c b/lustre/ldlm/ldlm_lockd.c
index 29c9360..88821ec 100644 (file)
--- a/lustre/ldlm/ldlm_lockd.c
+++ b/lustre/ldlm/ldlm_lockd.c
@@ -208,7 +208,8 @@ static void waiting_locks_callback(unsigned long unused)
                         break;
 
                 LDLM_ERROR(lock, "lock callback timer expired: evicting client "
-                           "%s@%s nid %s ",lock->l_export->exp_client_uuid.uuid,
+                           "%s@%s nid %s\n",
+                           lock->l_export->exp_client_uuid.uuid,
                            lock->l_export->exp_connection->c_remote_uuid.uuid,
                            libcfs_nid2str(lock->l_export->exp_connection->c_peer.nid));
 

diff --git a/lustre/ptlrpc/sec.c b/lustre/ptlrpc/sec.c
index 3fc9c93..15326f3 100644 (file)
--- a/lustre/ptlrpc/sec.c
+++ b/lustre/ptlrpc/sec.c
@@ -119,6 +119,7 @@ again:
                 policy = NULL;
         spin_unlock(&policy_lock);
 
+#ifdef CONFIG_KMOD
         /* if failure, try to load gss module, once */
         if (policy == NULL && load_module == 0 &&
             number == SPTLRPC_POLICY_GSS) {
@@ -126,6 +127,7 @@ again:
                 if (request_module("ptlrpc_gss") == 0)
                         goto again;
         }
+#endif
 
         return policy;
 }
@@ -2274,7 +2276,7 @@ static __u32 __flavors[] = {
 #define __nflavors      (sizeof(__flavors)/sizeof(__u32))
 
 /*
- * flavor string format: rpc[-bulk[:cksum/enc]]
+ * flavor string format: rpc[-bulk{n|i|p}[:cksum/enc]]
  * for examples:
  *  null
  *  plain-bulki

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 637c2c6..ed06fac 100644 (file)
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -52,9 +52,12 @@ init_test_env() {
         export PORT_OPT="--port $ACCEPTOR_PORT"
     fi
 
-    if [ "x$SEC" = "xkrb5i" -o "x$SEC" =  "xkrb5p" ]; then
-        export USING_KRB5="y"
-    fi
+    case "x$SEC" in
+        xkrb5*)
+            echo "Using GSS/krb5 ptlrpc security flavor"
+            export USING_KRB5="y"
+            ;;
+    esac
 
     # Paths on remote nodes, if different 
     export RLUSTRE=${RLUSTRE:-$LUSTRE}