aboutsummaryrefslogtreecommitdiffstats
path: root/fs/gfs2/locking/dlm/lock.c
diff options
context:
space:
mode:
authorSteven Whitehouse <swhiteho@redhat.com>2006-02-27 10:57:14 -0500
committerSteven Whitehouse <swhiteho@redhat.com>2006-02-27 10:57:14 -0500
commitd92a8d48085df863032110d9ccb221cde98d14e1 (patch)
treefaf03d9c10e104f3ab3fb8264e70b4662bae5d33 /fs/gfs2/locking/dlm/lock.c
parent2fcb4a1278ec41508d76786f4c5d23bff3b378ee (diff)
[GFS2] Audit printk and kmalloc
All printk calls now have KERN_ set where required and a couple of kmalloc(), memset(.., 0, ...) calls changed to kzalloc(). This is in response to comments from: Pekka Enberg <penberg@cs.helsinki.fi> and Eric Sesterhenn <snakebyte@gmx.de> Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2/locking/dlm/lock.c')
-rw-r--r--fs/gfs2/locking/dlm/lock.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/gfs2/locking/dlm/lock.c b/fs/gfs2/locking/dlm/lock.c
index 666d696dc8ce..1799d2237e7e 100644
--- a/fs/gfs2/locking/dlm/lock.c
+++ b/fs/gfs2/locking/dlm/lock.c
@@ -34,7 +34,7 @@ static inline void gdlm_bast(void *astarg, int mode)
34 struct gdlm_ls *ls = lp->ls; 34 struct gdlm_ls *ls = lp->ls;
35 35
36 if (!mode) { 36 if (!mode) {
37 printk("lock_dlm: bast mode zero %x,%llx\n", 37 printk(KERN_INFO "lock_dlm: bast mode zero %x,%llx\n",
38 lp->lockname.ln_type, lp->lockname.ln_number); 38 lp->lockname.ln_type, lp->lockname.ln_number);
39 return; 39 return;
40 } 40 }
@@ -408,7 +408,7 @@ static int hold_null_lock(struct gdlm_lock *lp)
408 int error; 408 int error;
409 409
410 if (lp->hold_null) { 410 if (lp->hold_null) {
411 printk("lock_dlm: lvb already held\n"); 411 printk(KERN_INFO "lock_dlm: lvb already held\n");
412 return 0; 412 return 0;
413 } 413 }
414 414
@@ -429,7 +429,8 @@ static int hold_null_lock(struct gdlm_lock *lp)
429 wait_for_completion(&lpn->ast_wait); 429 wait_for_completion(&lpn->ast_wait);
430 error = lp->lksb.sb_status; 430 error = lp->lksb.sb_status;
431 if (error) { 431 if (error) {
432 printk("lock_dlm: hold_null_lock dlm error %d\n", error); 432 printk(KERN_INFO "lock_dlm: hold_null_lock dlm error %d\n",
433 error);
433 gdlm_delete_lp(lpn); 434 gdlm_delete_lp(lpn);
434 lpn = NULL; 435 lpn = NULL;
435 } 436 }