diff --git a/lustre/include/linux/lustre_dlm.h b/lustre/include/linux/lustre_dlm.h
index 4cc56abb056afbaf359be0fd17c39bd2f59918d6..a0aae86dfa05ffc41ca90247c1781c92edd4bde2 100644
--- a/lustre/include/linux/lustre_dlm.h
+++ b/lustre/include/linux/lustre_dlm.h
@@ -393,7 +393,7 @@ void ldlm_cancel_locks_for_export(struct obd_export *export);
int ldlm_run_ast_work(struct list_head *rpc_list);
void ldlm_reprocess_all(struct ldlm_resource *res);
void ldlm_reprocess_all_ns(struct ldlm_namespace *ns);
-void ldlm_lock_dump(int level, struct ldlm_lock *lock);
+void ldlm_lock_dump(int level, struct ldlm_lock *lock, int pos);
void ldlm_lock_dump_handle(int level, struct lustre_handle *);
/* ldlm_test.c */
diff --git a/lustre/ldlm/ldlm_lock.c b/lustre/ldlm/ldlm_lock.c
index 325107544e8825ae3a7b8f114899b8b708ac6305..4b056557e8490a9a27c3d78a0b3bb6f8b17ba7c0 100644
--- a/lustre/ldlm/ldlm_lock.c
+++ b/lustre/ldlm/ldlm_lock.c
@@ -192,17 +192,17 @@ void ldlm_lock_destroy(struct ldlm_lock *lock)
if (!list_empty(&lock->l_children)) {
LDLM_ERROR(lock, "still has children (%p)!",
lock->l_children.next);
- ldlm_lock_dump(D_ERROR, lock);
+ ldlm_lock_dump(D_ERROR, lock, 0);
LBUG();
}
if (lock->l_readers || lock->l_writers) {
LDLM_ERROR(lock, "lock still has references");
- ldlm_lock_dump(D_ERROR, lock);
+ ldlm_lock_dump(D_ERROR, lock, 0);
LBUG();
}
if (!list_empty(&lock->l_res_link)) {
- ldlm_lock_dump(D_ERROR, lock);
+ ldlm_lock_dump(D_ERROR, lock, 0);
LBUG();
}
@@ -1044,7 +1044,7 @@ void ldlm_lock_cancel(struct ldlm_lock *lock)
* talking to me first. -phik */
if (lock->l_readers || lock->l_writers) {
LDLM_DEBUG(lock, "lock still has references");
- ldlm_lock_dump(D_OTHER, lock);
+ ldlm_lock_dump(D_OTHER, lock, 0);
LBUG();
}
@@ -1139,10 +1139,10 @@ struct ldlm_resource *ldlm_lock_convert(struct ldlm_lock *lock, int new_mode,
RETURN(res);
}
-void ldlm_lock_dump(int level, struct ldlm_lock *lock)
+void ldlm_lock_dump(int level, struct ldlm_lock *lock, int pos)
{
char ver[128];
- struct obd_device *obd;
+ struct obd_device *obd = NULL;
if (!((portal_debug | D_ERROR) & level))
return;
@@ -1159,9 +1159,10 @@ void ldlm_lock_dump(int level, struct ldlm_lock *lock)
lock->l_version[0], lock->l_version[1],
lock->l_version[2], lock->l_version[3]);
- CDEBUG(level, " -- Lock dump: %p (%s) (rc: %d)\n", lock, ver,
- atomic_read(&lock->l_refc));
- obd = class_conn2obd(lock->l_connh);
+ CDEBUG(level, " -- Lock dump: %p (%s) (rc: %d) (pos: %d)\n", lock, ver,
+ atomic_read(&lock->l_refc), pos);
+ if (lock->l_connh != NULL)
+ obd = class_conn2obd(lock->l_connh);
if (lock->l_export && lock->l_export->exp_connection) {
CDEBUG(level, " Node: NID "LPX64" on %s (rhandle: "LPX64")\n",
lock->l_export->exp_connection->c_peer.peer_nid,
@@ -1176,12 +1177,10 @@ void ldlm_lock_dump(int level, struct ldlm_lock *lock)
imp->imp_connection->c_peer.peer_ni->pni_name,
lock->l_remote_handle.cookie);
}
- CDEBUG(level, " Parent: %p\n", lock->l_parent);
CDEBUG(level, " Resource: %p ("LPD64")\n", lock->l_resource,
lock->l_resource->lr_name.name[0]);
- CDEBUG(level, " Requested mode: %d, granted mode: %d\n",
- (int)lock->l_req_mode, (int)lock->l_granted_mode);
- CDEBUG(level, " Readers: %u ; Writers; %u\n",
+ CDEBUG(level, " Req mode: %d, grant mode: %d, readers: %d, writers: "
+ "%d\n", (int)lock->l_req_mode, (int)lock->l_granted_mode,
lock->l_readers, lock->l_writers);
if (lock->l_resource->lr_type == LDLM_EXTENT)
CDEBUG(level, " Extent: "LPU64" -> "LPU64"\n",
@@ -1196,7 +1195,7 @@ void ldlm_lock_dump_handle(int level, struct lustre_handle *lockh)
if (lock == NULL)
return;
- ldlm_lock_dump(D_OTHER, lock);
+ ldlm_lock_dump(D_OTHER, lock, 0);
LDLM_LOCK_PUT(lock);
}
diff --git a/lustre/ldlm/ldlm_request.c b/lustre/ldlm/ldlm_request.c
index 75e6dbd99cba4a32fa1d26dd1862984eb0fc466d..aac4213cfb3eec7f53d0788a349e3f45c545db53 100644
--- a/lustre/ldlm/ldlm_request.c
+++ b/lustre/ldlm/ldlm_request.c
@@ -94,7 +94,7 @@ int ldlm_completion_ast(struct ldlm_lock *lock, int flags, void *data)
LDLM_DEBUG(lock, "client-side enqueue returned a blocked lock, "
"sleeping");
- ldlm_lock_dump(D_OTHER, lock);
+ ldlm_lock_dump(D_OTHER, lock, 0);
ldlm_reprocess_all(lock->l_resource);
noreproc:
diff --git a/lustre/ldlm/ldlm_resource.c b/lustre/ldlm/ldlm_resource.c
index 3d98afec1876b64759fd2adcb9278ab605bf47fa..eb6ab1bd353274df171437b30a26c607ad73f6b0 100644
--- a/lustre/ldlm/ldlm_resource.c
+++ b/lustre/ldlm/ldlm_resource.c
@@ -516,7 +516,7 @@ void ldlm_resource_add_lock(struct ldlm_resource *res, struct list_head *head,
ldlm_resource_dump(res);
CDEBUG(D_OTHER, "About to add this lock:\n");
- ldlm_lock_dump(D_OTHER, lock);
+ ldlm_lock_dump(D_OTHER, lock, 0);
if (lock->l_destroyed) {
CDEBUG(D_OTHER, "Lock destroyed, not adding to resource\n");
@@ -581,6 +581,7 @@ void ldlm_resource_dump(struct ldlm_resource *res)
{
struct list_head *tmp;
char name[256];
+ int pos;
if (RES_NAME_SIZE != 3)
LBUG();
@@ -597,23 +598,24 @@ void ldlm_resource_dump(struct ldlm_resource *res)
CDEBUG(D_OTHER, "Parent: %p, root: %p\n", res->lr_parent, res->lr_root);
CDEBUG(D_OTHER, "Granted locks:\n");
+ pos = 0;
list_for_each(tmp, &res->lr_granted) {
struct ldlm_lock *lock;
lock = list_entry(tmp, struct ldlm_lock, l_res_link);
- ldlm_lock_dump(D_OTHER, lock);
+ ldlm_lock_dump(D_OTHER, lock, ++pos);
}
-
+ pos = 0;
CDEBUG(D_OTHER, "Converting locks:\n");
list_for_each(tmp, &res->lr_converting) {
struct ldlm_lock *lock;
lock = list_entry(tmp, struct ldlm_lock, l_res_link);
- ldlm_lock_dump(D_OTHER, lock);
+ ldlm_lock_dump(D_OTHER, lock, ++pos);
}
-
+ pos = 0;
CDEBUG(D_OTHER, "Waiting locks:\n");
list_for_each(tmp, &res->lr_waiting) {
struct ldlm_lock *lock;
lock = list_entry(tmp, struct ldlm_lock, l_res_link);
- ldlm_lock_dump(D_OTHER, lock);
+ ldlm_lock_dump(D_OTHER, lock, ++pos);
}
}