Merge branch 'drm-next-3.15-wip' of git://people.freedesktop.org/~deathsimple/linux...

[karo-tx-linux.git] / fs / gfs2 / lock_dlm.c

diff --git a/fs/gfs2/lock_dlm.c b/fs/gfs2/lock_dlm.c
index 2a6ba06bee6fca0ffada9c155ca243466fcf1f62..c1eb555dc588e178cbbeee5e6771563a29f4a81a 100644 (file)
--- a/fs/gfs2/lock_dlm.c
+++ b/fs/gfs2/lock_dlm.c
@@ -7,6 +7,8 @@
  * of the GNU General Public License version 2.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/fs.h>
 #include <linux/dlm.h>
 #include <linux/slab.h>
@@ -176,7 +178,7 @@ static void gdlm_bast(void *arg, int mode)
                gfs2_glock_cb(gl, LM_ST_SHARED);
                break;
        default:
-               printk(KERN_ERR "unknown bast mode %d", mode);
+               pr_err("unknown bast mode %d\n", mode);
                BUG();
        }
 }
@@ -195,7 +197,7 @@ static int make_mode(const unsigned int lmstate)
        case LM_ST_SHARED:
                return DLM_LOCK_PR;
        }
-       printk(KERN_ERR "unknown LM state %d", lmstate);
+       pr_err("unknown LM state %d\n", lmstate);
        BUG();
        return -1;
 }
@@ -308,7 +310,7 @@ static void gdlm_put_lock(struct gfs2_glock *gl)
        error = dlm_unlock(ls->ls_dlm, gl->gl_lksb.sb_lkid, DLM_LKF_VALBLK,
                           NULL, gl);
        if (error) {
-               printk(KERN_ERR "gdlm_unlock %x,%llx err=%d\n",
+               pr_err("gdlm_unlock %x,%llx err=%d\n",
                       gl->gl_name.ln_type,
                       (unsigned long long)gl->gl_name.ln_number, error);
                return;
@@ -1102,7 +1104,7 @@ static void gdlm_recover_slot(void *arg, struct dlm_slot *slot)
        }
 
        if (ls->ls_recover_submit[jid]) {
-               fs_info(sdp, "recover_slot jid %d gen %u prev %u",
+               fs_info(sdp, "recover_slot jid %d gen %u prev %u\n",
                        jid, ls->ls_recover_block, ls->ls_recover_submit[jid]);
        }
        ls->ls_recover_submit[jid] = ls->ls_recover_block;