[Ocfs2-commits] khackel commits r1966 - trunk/fs/ocfs2/dlm
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Tue Mar 8 19:11:16 CST 2005
Author: khackel
Signed-off-by: mfasheh
Date: 2005-03-08 19:11:15 -0600 (Tue, 08 Mar 2005)
New Revision: 1966
Modified:
trunk/fs/ocfs2/dlm/dlmmaster.c
trunk/fs/ocfs2/dlm/dlmmod.c
Log:
* change debugging output to printk
Signed-off-by: mfasheh
Modified: trunk/fs/ocfs2/dlm/dlmmaster.c
===================================================================
--- trunk/fs/ocfs2/dlm/dlmmaster.c 2005-03-09 00:46:54 UTC (rev 1965)
+++ trunk/fs/ocfs2/dlm/dlmmaster.c 2005-03-09 01:11:15 UTC (rev 1966)
@@ -65,8 +65,8 @@
unsigned int namelen;
const char *name;
- dlmprintk("dumping all mles for domain %s:\n", dlm->name);
- dlmprintk0(" ####: type refs owner events? err? lockname\n");
+ printk("dumping all mles for domain %s:\n", dlm->name);
+ printk(" ####: type refs owner events? err? lockname\n");
spin_lock(&dlm->master_lock);
list_for_each(iter, &dlm->master_list) {
@@ -88,7 +88,7 @@
name = mle->u.res->lockname.name;
}
- dlmprintk(" #%3d: %3s %3d %3u %c %c (%d)%.*s\n",
+ printk(" #%3d: %3s %3d %3u %c %c (%d)%.*s\n",
i, type, refs, master, attached, err,
namelen, namelen, name);
}
@@ -104,15 +104,13 @@
struct list_head *iter;
dlm_ctxt *dlm;
- dlmprintk0("welcome to dlm_dump_all_mles\n");
spin_lock(&dlm_domain_lock);
list_for_each(iter, &dlm_domains) {
dlm = list_entry (iter, dlm_ctxt, list);
- dlmprintk("found dlm: %p, name=%s\n", dlm, dlm->name);
+ printk("found dlm: %p, name=%s\n", dlm, dlm->name);
dlm_dump_mles(dlm);
}
spin_unlock(&dlm_domain_lock);
- dlmprintk0("leaving dlm_dump_all_mles\n");
}
EXPORT_SYMBOL(dlm_dump_all_mles);
#endif
Modified: trunk/fs/ocfs2/dlm/dlmmod.c
===================================================================
--- trunk/fs/ocfs2/dlm/dlmmod.c 2005-03-09 00:46:54 UTC (rev 1965)
+++ trunk/fs/ocfs2/dlm/dlmmod.c 2005-03-09 01:11:15 UTC (rev 1966)
@@ -111,7 +111,7 @@
char c;
dlm_debug_func_t *fn;
- dlmprintk("(%p, %p, %u, %lld)\n",
+ printk("(%p, %p, %u, %lld)\n",
file, buf, (unsigned int)count, (long long)*ppos);
if (!count)
return 0;
@@ -976,7 +976,7 @@
dlm_ctxt *dlm;
struct list_head *iter;
- dlmprintk("dumping ALL dlm state for node %s\n",
+ printk("dumping ALL dlm state for node %s\n",
system_utsname.nodename);
spin_lock(&dlm_domain_lock);
list_for_each(iter, &dlm_domains) {
@@ -994,11 +994,11 @@
struct list_head *bucket;
int i;
- dlmprintk("dlm_ctxt: %s, group=%u, key=%u\n",
+ printk("dlm_ctxt: %s, group=%u, key=%u\n",
dlm->name, dlm->group_index, dlm->key);
- dlmprintk0("some bug here... should not have to check for this...\n");
+ printk("some bug here... should not have to check for this...\n");
if (!dlm || !dlm->name) {
- dlmprintk("wtf... dlm=%p\n", dlm);
+ printk("wtf... dlm=%p\n", dlm);
return;
}
@@ -1007,38 +1007,38 @@
bucket = &(dlm->resources[i]);
list_for_each(iter, bucket) {
res = list_entry(iter, dlm_lock_resource, list);
- dlmprintk("lockres: %.*s, owner=%u, state=%u\n",
- res->lockname.len, res->lockname.name,
+ printk("lockres: %.*s, owner=%u, state=%u\n",
+ res->lockname.len, res->lockname.name,
res->owner, res->state);
spin_lock(&res->spinlock);
- dlmprintk0(" granted queue: \n");
+ printk(" granted queue: \n");
list_for_each(iter2, &res->granted) {
lock = list_entry(iter2, dlm_lock, list);
spin_lock(&lock->spinlock);
- dlmprintk(" type=%d, conv=%d, node=%u, "
- "cookie=%llu\n", lock->ml.type,
- lock->ml.convert_type, lock->ml.node,
- lock->ml.cookie);
+ printk(" type=%d, conv=%d, node=%u, "
+ "cookie=%llu\n", lock->ml.type,
+ lock->ml.convert_type, lock->ml.node,
+ lock->ml.cookie);
spin_unlock(&lock->spinlock);
}
- dlmprintk0(" converting queue: \n");
+ printk(" converting queue: \n");
list_for_each(iter2, &res->converting) {
lock = list_entry(iter2, dlm_lock, list);
spin_lock(&lock->spinlock);
- dlmprintk(" type=%d, conv=%d, node=%u, "
- "cookie=%llu\n", lock->ml.type,
- lock->ml.convert_type, lock->ml.node,
- lock->ml.cookie);
+ printk(" type=%d, conv=%d, node=%u, "
+ "cookie=%llu\n", lock->ml.type,
+ lock->ml.convert_type, lock->ml.node,
+ lock->ml.cookie);
spin_unlock(&lock->spinlock);
}
- dlmprintk0(" blocked queue: \n");
+ printk(" blocked queue: \n");
list_for_each(iter2, &res->blocked) {
lock = list_entry(iter2, dlm_lock, list);
spin_lock(&lock->spinlock);
- dlmprintk(" type=%d, conv=%d, node=%u, "
- "cookie=%llu\n", lock->ml.type,
- lock->ml.convert_type, lock->ml.node,
- lock->ml.cookie);
+ printk(" type=%d, conv=%d, node=%u, "
+ "cookie=%llu\n", lock->ml.type,
+ lock->ml.convert_type, lock->ml.node,
+ lock->ml.cookie);
spin_unlock(&lock->spinlock);
}
spin_unlock(&res->spinlock);
More information about the Ocfs2-commits
mailing list