- Fixed lock tests--early indicates are that extents are working

diff --git a/lustre/ldlm/ldlm_lock.c b/lustre/ldlm/ldlm_lock.c
index 286e1ad..ef47d1e 100644 (file)
--- a/lustre/ldlm/ldlm_lock.c
+++ b/lustre/ldlm/ldlm_lock.c
@@ -294,6 +294,10 @@ void ldlm_lock_dump(struct ldlm_lock *lock)
 
         CDEBUG(D_OTHER, "  -- Lock dump: %p (%s)\n", lock, ver);
         CDEBUG(D_OTHER, "  Parent: %p\n", lock->l_parent);
+        CDEBUG(D_OTHER, "  Resource: %p\n", lock->l_resource);
         CDEBUG(D_OTHER, "  Requested mode: %d, granted mode: %d\n",
                (int)lock->l_req_mode, (int)lock->l_granted_mode);
+        if (lock->l_resource->lr_type == LDLM_EXTENT)
+                CDEBUG(D_OTHER, "  Extent: %Lu -> %Lu\n",
+                       lock->l_extent.start, lock->l_extent.end);
 }

diff --git a/lustre/ldlm/ldlm_test.c b/lustre/ldlm/ldlm_test.c
index 4b185bd..17bbd76 100644 (file)
--- a/lustre/ldlm/ldlm_test.c
+++ b/lustre/ldlm/ldlm_test.c
@@ -93,7 +93,7 @@ int ldlm_test_extents(struct obd_device *obddev)
                 LBUG();
 
         flags = 0;
-        err = ldlm_local_lock_enqueue(obddev, 1, NULL, res_id, LDLM_EXTENT,
+        err = ldlm_local_lock_enqueue(obddev, 2, NULL, res_id, LDLM_EXTENT,
                                       &ext1, LCK_PR, &flags, NULL, NULL, NULL,
                                       0, &ext1_h);
         if (err != ELDLM_OK)
@@ -102,7 +102,7 @@ int ldlm_test_extents(struct obd_device *obddev)
                 LBUG();
 
         flags = 0;
-        err = ldlm_local_lock_enqueue(obddev, 1, NULL, res_id, LDLM_EXTENT,
+        err = ldlm_local_lock_enqueue(obddev, 2, NULL, res_id, LDLM_EXTENT,
                                       &ext2, LCK_PR, &flags, NULL, NULL, NULL,
                                       0, &ext2_h);
         if (err != ELDLM_OK)
@@ -111,7 +111,7 @@ int ldlm_test_extents(struct obd_device *obddev)
                 LBUG();
 
         flags = 0;
-        err = ldlm_local_lock_enqueue(obddev, 1, NULL, res_id, LDLM_EXTENT,
+        err = ldlm_local_lock_enqueue(obddev, 2, NULL, res_id, LDLM_EXTENT,
                                       &ext3, LCK_EX, &flags, NULL, NULL, NULL,
                                       0, &ext3_h);
         if (err != -ELDLM_BLOCK_GRANTED)
@@ -126,7 +126,7 @@ int ldlm_test_extents(struct obd_device *obddev)
                 LBUG();
 
         flags = 0;
-        err = ldlm_local_lock_cancel(obddev, &ext1_h);
+        err = ldlm_local_lock_cancel(obddev, &ext2_h);
         if (err != ELDLM_OK)
                 LBUG();