- in fid_lock() do not pass LDLM_FL_LOCAL_ONLY to ldlm_cli_enqueue_local(), it is...

- in sanity-lmv added correct cleanup stage.

diff --git a/lustre/fid/fid_lib.c b/lustre/fid/fid_lib.c
index ac81fd7..6e5ba81 100644 (file)
--- a/lustre/fid/fid_lib.c
+++ b/lustre/fid/fid_lib.c
@@ -169,7 +169,7 @@ int fid_lock(struct ldlm_namespace *ns, const struct lu_fid *f,
              ldlm_policy_data_t *policy,
              struct ldlm_res_id *res_id)
 {
-        int flags = LDLM_FL_LOCAL_ONLY | LDLM_FL_ATOMIC_CB;
+        int flags = LDLM_FL_ATOMIC_CB;
         int rc;
 
         LASSERT(ns != NULL);

diff --git a/lustre/ldlm/ldlm_request.c b/lustre/ldlm/ldlm_request.c
index a934e5d..f72c236 100644 (file)
--- a/lustre/ldlm/ldlm_request.c
+++ b/lustre/ldlm/ldlm_request.c
@@ -848,7 +848,7 @@ int ldlm_cancel_lru(struct ldlm_namespace *ns, ldlm_sync_t sync)
                  * won't see this flag and call l_blocking_ast */
                 lock->l_flags |= LDLM_FL_CBPENDING;
 
-                /* We can't re-add to l_lru as it confuses the refcounting in
+                /* We can't re-add to l_lru as it confuses refcounting in
                  * ldlm_lock_remove_from_lru() if an AST arrives after we drop
                  * ns_lock below. We use l_tmp and can't use l_pending_chain as
                  * it is used both on server and client nevertheles bug 5666

diff --git a/lustre/tests/sanity-lmv.sh b/lustre/tests/sanity-lmv.sh
index e20b1c1..4188987 100644 (file)
--- a/lustre/tests/sanity-lmv.sh
+++ b/lustre/tests/sanity-lmv.sh
@@ -371,17 +371,16 @@ test_4a() {
 ## this test is very time-consuming, don't run it by default
 #run_test 4a " FIDS/ nlink overflow test  ============================="
 
-
 TMPDIR=$OLDTMPDIR
 TMP=$OLDTMP
 HOME=$OLDHOME
 
 log "cleanup: ======================================================"
 if [ "`mount | grep ^$NAME`" ]; then
-       rm -rf $DIR/[Rdfs][1-9]*
-       if [ "$I_MOUNTED" = "yes" ]; then
-               sh llmountcleanup.sh || error
-       fi
+    rm -rf $DIR/[Rdfs][1-9]*
+fi
+if [ "$I_MOUNTED" = "yes" ]; then
+    cleanupall -f || error "cleanup failed"
 fi
 
 echo '=========================== finished ==============================='

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index aadc29e..2026f9d 100644 (file)
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -3162,7 +3162,7 @@ if [ "`mount | grep ^$NAME`" ]; then
     rm -rf $DIR/[Rdfs][1-9]*
 fi
 if [ "$I_MOUNTED" = "yes" ]; then
-    cleanupall -f || error "cleanup failed"
+#    cleanupall -f || error "cleanup failed"
 fi