Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluet...

[linux-2.6] / fs / ocfs2 / dlm / dlmdebug.c

diff --git a/fs/ocfs2/dlm/dlmdebug.c b/fs/ocfs2/dlm/dlmdebug.c
index 53a9e6093e6fedc51d42c73a3d30f05e61c74ee2..1b81dcba175d083ba5cefad5178c2c1a8a3ef271 100644 (file)
--- a/fs/ocfs2/dlm/dlmdebug.c
+++ b/fs/ocfs2/dlm/dlmdebug.c
@@ -44,7 +44,8 @@
 #define MLOG_MASK_PREFIX ML_DLM
 #include "cluster/masklog.h"
 
-int stringify_lockname(const char *lockname, int locklen, char *buf, int len);
+static int stringify_lockname(const char *lockname, int locklen, char *buf,
+                             int len);
 
 void dlm_print_one_lock_resource(struct dlm_lock_resource *res)
 {
@@ -58,23 +59,23 @@ static void dlm_print_lockres_refmap(struct dlm_lock_resource *res)
        int bit;
        assert_spin_locked(&res->spinlock);
 
-       printk(KERN_NOTICE "  refmap nodes: [ ");
+       printk("  refmap nodes: [ ");
        bit = 0;
        while (1) {
                bit = find_next_bit(res->refmap, O2NM_MAX_NODES, bit);
                if (bit >= O2NM_MAX_NODES)
                        break;
-               printk(KERN_NOTICE "%u ", bit);
+               printk("%u ", bit);
                bit++;
        }
-       printk(KERN_NOTICE "], inflight=%u\n", res->inflight_locks);
+       printk("], inflight=%u\n", res->inflight_locks);
 }
 
 static void __dlm_print_lock(struct dlm_lock *lock)
 {
        spin_lock(&lock->spinlock);
 
-       printk(KERN_NOTICE "    type=%d, conv=%d, node=%u, cookie=%u:%llu, "
+       printk("    type=%d, conv=%d, node=%u, cookie=%u:%llu, "
               "ref=%u, ast=(empty=%c,pend=%c), bast=(empty=%c,pend=%c), "
               "pending=(conv=%c,lock=%c,cancel=%c,unlock=%c)\n",
               lock->ml.type, lock->ml.convert_type, lock->ml.node,
@@ -103,30 +104,30 @@ void __dlm_print_one_lock_resource(struct dlm_lock_resource *res)
 
        stringify_lockname(res->lockname.name, res->lockname.len,
                           buf, sizeof(buf) - 1);
-       printk(KERN_NOTICE "lockres: %s, owner=%u, state=%u\n",
+       printk("lockres: %s, owner=%u, state=%u\n",
               buf, res->owner, res->state);
-       printk(KERN_NOTICE "  last used: %lu, refcnt: %u, on purge list: %s\n",
+       printk("  last used: %lu, refcnt: %u, on purge list: %s\n",
               res->last_used, atomic_read(&res->refs.refcount),
               list_empty(&res->purge) ? "no" : "yes");
-       printk(KERN_NOTICE "  on dirty list: %s, on reco list: %s, "
+       printk("  on dirty list: %s, on reco list: %s, "
               "migrating pending: %s\n",
               list_empty(&res->dirty) ? "no" : "yes",
               list_empty(&res->recovering) ? "no" : "yes",
               res->migration_pending ? "yes" : "no");
-       printk(KERN_NOTICE "  inflight locks: %d, asts reserved: %d\n",
+       printk("  inflight locks: %d, asts reserved: %d\n",
               res->inflight_locks, atomic_read(&res->asts_reserved));
        dlm_print_lockres_refmap(res);
-       printk(KERN_NOTICE "  granted queue:\n");
+       printk("  granted queue:\n");
        list_for_each(iter2, &res->granted) {
                lock = list_entry(iter2, struct dlm_lock, list);
                __dlm_print_lock(lock);
        }
-       printk(KERN_NOTICE "  converting queue:\n");
+       printk("  converting queue:\n");
        list_for_each(iter2, &res->converting) {
                lock = list_entry(iter2, struct dlm_lock, list);
                __dlm_print_lock(lock);
        }
-       printk(KERN_NOTICE "  blocked queue:\n");
+       printk("  blocked queue:\n");
        list_for_each(iter2, &res->blocked) {
                lock = list_entry(iter2, struct dlm_lock, list);
                __dlm_print_lock(lock);
@@ -251,7 +252,8 @@ EXPORT_SYMBOL_GPL(dlm_errname);
  *
  * For more on lockname formats, please refer to dlmglue.c and ocfs2_lockid.h.
  */
-int stringify_lockname(const char *lockname, int locklen, char *buf, int len)
+static int stringify_lockname(const char *lockname, int locklen, char *buf,
+                             int len)
 {
        int out = 0;
        __be64 inode_blkno_be;
@@ -368,7 +370,7 @@ static void dlm_debug_free(struct kref *kref)
        kfree(dc);
 }
 
-void dlm_debug_put(struct dlm_debug_ctxt *dc)
+static void dlm_debug_put(struct dlm_debug_ctxt *dc)
 {
        if (dc)
                kref_put(&dc->debug_refcnt, dlm_debug_free);