diff options
-rw-r--r-- | fs/ocfs2/dlm/dlmdebug.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/fs/ocfs2/dlm/dlmdebug.c b/fs/ocfs2/dlm/dlmdebug.c index 53a9e6093e6f..5f6d858770a2 100644 --- a/fs/ocfs2/dlm/dlmdebug.c +++ b/fs/ocfs2/dlm/dlmdebug.c | |||
@@ -58,23 +58,23 @@ static void dlm_print_lockres_refmap(struct dlm_lock_resource *res) | |||
58 | int bit; | 58 | int bit; |
59 | assert_spin_locked(&res->spinlock); | 59 | assert_spin_locked(&res->spinlock); |
60 | 60 | ||
61 | printk(KERN_NOTICE " refmap nodes: [ "); | 61 | printk(" refmap nodes: [ "); |
62 | bit = 0; | 62 | bit = 0; |
63 | while (1) { | 63 | while (1) { |
64 | bit = find_next_bit(res->refmap, O2NM_MAX_NODES, bit); | 64 | bit = find_next_bit(res->refmap, O2NM_MAX_NODES, bit); |
65 | if (bit >= O2NM_MAX_NODES) | 65 | if (bit >= O2NM_MAX_NODES) |
66 | break; | 66 | break; |
67 | printk(KERN_NOTICE "%u ", bit); | 67 | printk("%u ", bit); |
68 | bit++; | 68 | bit++; |
69 | } | 69 | } |
70 | printk(KERN_NOTICE "], inflight=%u\n", res->inflight_locks); | 70 | printk("], inflight=%u\n", res->inflight_locks); |
71 | } | 71 | } |
72 | 72 | ||
73 | static void __dlm_print_lock(struct dlm_lock *lock) | 73 | static void __dlm_print_lock(struct dlm_lock *lock) |
74 | { | 74 | { |
75 | spin_lock(&lock->spinlock); | 75 | spin_lock(&lock->spinlock); |
76 | 76 | ||
77 | printk(KERN_NOTICE " type=%d, conv=%d, node=%u, cookie=%u:%llu, " | 77 | printk(" type=%d, conv=%d, node=%u, cookie=%u:%llu, " |
78 | "ref=%u, ast=(empty=%c,pend=%c), bast=(empty=%c,pend=%c), " | 78 | "ref=%u, ast=(empty=%c,pend=%c), bast=(empty=%c,pend=%c), " |
79 | "pending=(conv=%c,lock=%c,cancel=%c,unlock=%c)\n", | 79 | "pending=(conv=%c,lock=%c,cancel=%c,unlock=%c)\n", |
80 | lock->ml.type, lock->ml.convert_type, lock->ml.node, | 80 | lock->ml.type, lock->ml.convert_type, lock->ml.node, |
@@ -103,30 +103,30 @@ void __dlm_print_one_lock_resource(struct dlm_lock_resource *res) | |||
103 | 103 | ||
104 | stringify_lockname(res->lockname.name, res->lockname.len, | 104 | stringify_lockname(res->lockname.name, res->lockname.len, |
105 | buf, sizeof(buf) - 1); | 105 | buf, sizeof(buf) - 1); |
106 | printk(KERN_NOTICE "lockres: %s, owner=%u, state=%u\n", | 106 | printk("lockres: %s, owner=%u, state=%u\n", |
107 | buf, res->owner, res->state); | 107 | buf, res->owner, res->state); |
108 | printk(KERN_NOTICE " last used: %lu, refcnt: %u, on purge list: %s\n", | 108 | printk(" last used: %lu, refcnt: %u, on purge list: %s\n", |
109 | res->last_used, atomic_read(&res->refs.refcount), | 109 | res->last_used, atomic_read(&res->refs.refcount), |
110 | list_empty(&res->purge) ? "no" : "yes"); | 110 | list_empty(&res->purge) ? "no" : "yes"); |
111 | printk(KERN_NOTICE " on dirty list: %s, on reco list: %s, " | 111 | printk(" on dirty list: %s, on reco list: %s, " |
112 | "migrating pending: %s\n", | 112 | "migrating pending: %s\n", |
113 | list_empty(&res->dirty) ? "no" : "yes", | 113 | list_empty(&res->dirty) ? "no" : "yes", |
114 | list_empty(&res->recovering) ? "no" : "yes", | 114 | list_empty(&res->recovering) ? "no" : "yes", |
115 | res->migration_pending ? "yes" : "no"); | 115 | res->migration_pending ? "yes" : "no"); |
116 | printk(KERN_NOTICE " inflight locks: %d, asts reserved: %d\n", | 116 | printk(" inflight locks: %d, asts reserved: %d\n", |
117 | res->inflight_locks, atomic_read(&res->asts_reserved)); | 117 | res->inflight_locks, atomic_read(&res->asts_reserved)); |
118 | dlm_print_lockres_refmap(res); | 118 | dlm_print_lockres_refmap(res); |
119 | printk(KERN_NOTICE " granted queue:\n"); | 119 | printk(" granted queue:\n"); |
120 | list_for_each(iter2, &res->granted) { | 120 | list_for_each(iter2, &res->granted) { |
121 | lock = list_entry(iter2, struct dlm_lock, list); | 121 | lock = list_entry(iter2, struct dlm_lock, list); |
122 | __dlm_print_lock(lock); | 122 | __dlm_print_lock(lock); |
123 | } | 123 | } |
124 | printk(KERN_NOTICE " converting queue:\n"); | 124 | printk(" converting queue:\n"); |
125 | list_for_each(iter2, &res->converting) { | 125 | list_for_each(iter2, &res->converting) { |
126 | lock = list_entry(iter2, struct dlm_lock, list); | 126 | lock = list_entry(iter2, struct dlm_lock, list); |
127 | __dlm_print_lock(lock); | 127 | __dlm_print_lock(lock); |
128 | } | 128 | } |
129 | printk(KERN_NOTICE " blocked queue:\n"); | 129 | printk(" blocked queue:\n"); |
130 | list_for_each(iter2, &res->blocked) { | 130 | list_for_each(iter2, &res->blocked) { |
131 | lock = list_entry(iter2, struct dlm_lock, list); | 131 | lock = list_entry(iter2, struct dlm_lock, list); |
132 | __dlm_print_lock(lock); | 132 | __dlm_print_lock(lock); |