diff options
Diffstat (limited to 'fs/gfs2/lock_dlm.c')
-rw-r--r-- | fs/gfs2/lock_dlm.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/fs/gfs2/lock_dlm.c b/fs/gfs2/lock_dlm.c index 2a6ba06bee6f..c1eb555dc588 100644 --- a/fs/gfs2/lock_dlm.c +++ b/fs/gfs2/lock_dlm.c | |||
@@ -7,6 +7,8 @@ | |||
7 | * of the GNU General Public License version 2. | 7 | * of the GNU General Public License version 2. |
8 | */ | 8 | */ |
9 | 9 | ||
10 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | ||
11 | |||
10 | #include <linux/fs.h> | 12 | #include <linux/fs.h> |
11 | #include <linux/dlm.h> | 13 | #include <linux/dlm.h> |
12 | #include <linux/slab.h> | 14 | #include <linux/slab.h> |
@@ -176,7 +178,7 @@ static void gdlm_bast(void *arg, int mode) | |||
176 | gfs2_glock_cb(gl, LM_ST_SHARED); | 178 | gfs2_glock_cb(gl, LM_ST_SHARED); |
177 | break; | 179 | break; |
178 | default: | 180 | default: |
179 | printk(KERN_ERR "unknown bast mode %d", mode); | 181 | pr_err("unknown bast mode %d\n", mode); |
180 | BUG(); | 182 | BUG(); |
181 | } | 183 | } |
182 | } | 184 | } |
@@ -195,7 +197,7 @@ static int make_mode(const unsigned int lmstate) | |||
195 | case LM_ST_SHARED: | 197 | case LM_ST_SHARED: |
196 | return DLM_LOCK_PR; | 198 | return DLM_LOCK_PR; |
197 | } | 199 | } |
198 | printk(KERN_ERR "unknown LM state %d", lmstate); | 200 | pr_err("unknown LM state %d\n", lmstate); |
199 | BUG(); | 201 | BUG(); |
200 | return -1; | 202 | return -1; |
201 | } | 203 | } |
@@ -308,7 +310,7 @@ static void gdlm_put_lock(struct gfs2_glock *gl) | |||
308 | error = dlm_unlock(ls->ls_dlm, gl->gl_lksb.sb_lkid, DLM_LKF_VALBLK, | 310 | error = dlm_unlock(ls->ls_dlm, gl->gl_lksb.sb_lkid, DLM_LKF_VALBLK, |
309 | NULL, gl); | 311 | NULL, gl); |
310 | if (error) { | 312 | if (error) { |
311 | printk(KERN_ERR "gdlm_unlock %x,%llx err=%d\n", | 313 | pr_err("gdlm_unlock %x,%llx err=%d\n", |
312 | gl->gl_name.ln_type, | 314 | gl->gl_name.ln_type, |
313 | (unsigned long long)gl->gl_name.ln_number, error); | 315 | (unsigned long long)gl->gl_name.ln_number, error); |
314 | return; | 316 | return; |
@@ -1102,7 +1104,7 @@ static void gdlm_recover_slot(void *arg, struct dlm_slot *slot) | |||
1102 | } | 1104 | } |
1103 | 1105 | ||
1104 | if (ls->ls_recover_submit[jid]) { | 1106 | if (ls->ls_recover_submit[jid]) { |
1105 | fs_info(sdp, "recover_slot jid %d gen %u prev %u", | 1107 | fs_info(sdp, "recover_slot jid %d gen %u prev %u\n", |
1106 | jid, ls->ls_recover_block, ls->ls_recover_submit[jid]); | 1108 | jid, ls->ls_recover_block, ls->ls_recover_submit[jid]); |
1107 | } | 1109 | } |
1108 | ls->ls_recover_submit[jid] = ls->ls_recover_block; | 1110 | ls->ls_recover_submit[jid] = ls->ls_recover_block; |