[prev in list] [next in list] [prev in thread] [next in thread] 

List:       lustre-cvs
Subject:    [lustre-cvs] b_devel: lustre/ldlm ldlm_lib.c ldlm_lock.c
From:       Eric Barton <eeb () moraine ! clusterfs ! com>
Date:       2003-09-30 9:25:57
[Download RAW message or body]

Update of /cvsroot/lustre/lustre/ldlm
In directory moraine.clusterfs.com:/tmp/cvs-serv28387/ldlm

Modified Files:
      Tag: b_devel
	ldlm_lib.c ldlm_lock.c 
Log Message:
*  Merged HEAD diffs


Index: ldlm_lib.c
===================================================================
RCS file: /cvsroot/lustre/lustre/ldlm/ldlm_lib.c,v
retrieving revision 1.1.2.29
retrieving revision 1.1.2.30
diff -u -w -b -B -p -r1.1.2.29 -r1.1.2.30
--- ldlm_lib.c	28 Sep 2003 05:25:08 -0000	1.1.2.29
+++ ldlm_lib.c	30 Sep 2003 09:25:53 -0000	1.1.2.30
@@ -476,7 +476,7 @@ static void reset_recovery_timer(struct 
 
         if (!recovering)
                 return;
-        CERROR("timer will expire in %ld seconds\n", OBD_RECOVERY_TIMEOUT / HZ);
+        CERROR("timer will expire in %d seconds\n", OBD_RECOVERY_TIMEOUT / HZ);
         mod_timer(&obd->obd_recovery_timer, jiffies + OBD_RECOVERY_TIMEOUT);
 }
 

Index: ldlm_lock.c
===================================================================
RCS file: /cvsroot/lustre/lustre/ldlm/ldlm_lock.c,v
retrieving revision 1.117.6.29
retrieving revision 1.117.6.30
diff -u -w -b -B -p -r1.117.6.29 -r1.117.6.30
--- ldlm_lock.c	16 Sep 2003 18:23:24 -0000	1.117.6.29
+++ ldlm_lock.c	30 Sep 2003 09:25:53 -0000	1.117.6.30
@@ -409,6 +409,8 @@ static void ldlm_add_ast_work_item(struc
         if (new && (lock->l_flags & LDLM_FL_AST_SENT))
                 GOTO(out, 0);
 
+        CDEBUG(D_OTHER, "lock %p incompatible; sending blocking AST.\n", lock);
+
         OBD_ALLOC(w, sizeof(*w));
         if (!w) {
                 LBUG();
@@ -568,11 +570,8 @@ static int ldlm_lock_compat_list(struct 
 
                 rc = 0;
 
-                if (send_cbs && child->l_blocking_ast != NULL) {
-                        CDEBUG(D_OTHER, "lock %p incompatible; sending "
-                               "blocking AST.\n", child);
+                if (send_cbs && child->l_blocking_ast != NULL)
                         ldlm_add_ast_work_item(child, lock, NULL, 0);
-                }
         }
 
         return rc;

_______________________________________________
Lustre-cvs mailing list
Lustre-cvs@lists.clusterfs.com
https://lists.clusterfs.com/mailman/listinfo/lustre-cvs
[prev in list] [next in list] [prev in thread] [next in thread]