Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d92a8d48 authored by Steven Whitehouse's avatar Steven Whitehouse
Browse files

[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: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent 2fcb4a12

fs/gfs2/glock.c

+26 −26
Original line number Diff line number Diff line
@@ -2315,17 +2315,17 @@ static int dump_holder(char *str, struct gfs2_holder *gh) 
	unsigned int x;

	int error = -ENOBUFS;



	printk("  %s\n", str);

	printk("    owner = %ld\n",

	printk(KERN_INFO "  %s\n", str);

	printk(KERN_INFO "    owner = %ld\n",

		   (gh->gh_owner) ? (long)gh->gh_owner->pid : -1);

	printk("    gh_state = %u\n", gh->gh_state);

	printk("    gh_flags =");

	printk(KERN_INFO "    gh_state = %u\n", gh->gh_state);

	printk(KERN_INFO "    gh_flags =");

	for (x = 0; x < 32; x++)

		if (gh->gh_flags & (1 << x))

			printk(" %u", x);

	printk(" \n");

	printk("    error = %d\n", gh->gh_error);

	printk("    gh_iflags =");

	printk(KERN_INFO "    error = %d\n", gh->gh_error);

	printk(KERN_INFO "    gh_iflags =");

	for (x = 0; x < 32; x++)

		if (test_bit(x, &gh->gh_iflags))

			printk(" %u", x);
@@ -2348,17 +2348,17 @@ static int dump_inode(struct gfs2_inode *ip) 
	unsigned int x;

	int error = -ENOBUFS;



	printk("  Inode:\n");

	printk("    num = %llu %llu\n",

	printk(KERN_INFO "  Inode:\n");

	printk(KERN_INFO "    num = %llu %llu\n",

		    ip->i_num.no_formal_ino, ip->i_num.no_addr);

	printk("    type = %u\n", IF2DT(ip->i_di.di_mode));

	printk("    i_count = %d\n", atomic_read(&ip->i_count));

	printk("    i_flags =");

	printk(KERN_INFO "    type = %u\n", IF2DT(ip->i_di.di_mode));

	printk(KERN_INFO "    i_count = %d\n", atomic_read(&ip->i_count));

	printk(KERN_INFO "    i_flags =");

	for (x = 0; x < 32; x++)

		if (test_bit(x, &ip->i_flags))

			printk(" %u", x);

	printk(" \n");

	printk("    vnode = %s\n", (ip->i_vnode) ? "yes" : "no");

	printk(KERN_INFO "    vnode = %s\n", (ip->i_vnode) ? "yes" : "no");



	error = 0;
@@ -2381,30 +2381,30 @@ static int dump_glock(struct gfs2_glock *gl) 


	spin_lock(&gl->gl_spin);



	printk("Glock (%u, %llu)\n",

	printk(KERN_INFO "Glock (%u, %llu)\n",

		    gl->gl_name.ln_type,

		    gl->gl_name.ln_number);

	printk("  gl_flags =");

	printk(KERN_INFO "  gl_flags =");

	for (x = 0; x < 32; x++)

		if (test_bit(x, &gl->gl_flags))

			printk(" %u", x);

	printk(" \n");

	printk("  gl_ref = %d\n", atomic_read(&gl->gl_ref.refcount));

	printk("  gl_state = %u\n", gl->gl_state);

	printk("  req_gh = %s\n", (gl->gl_req_gh) ? "yes" : "no");

	printk("  req_bh = %s\n", (gl->gl_req_bh) ? "yes" : "no");

	printk("  lvb_count = %d\n", atomic_read(&gl->gl_lvb_count));

	printk("  object = %s\n", (gl->gl_object) ? "yes" : "no");

	printk("  le = %s\n",

	printk(KERN_INFO "  gl_ref = %d\n", atomic_read(&gl->gl_ref.refcount));

	printk(KERN_INFO "  gl_state = %u\n", gl->gl_state);

	printk(KERN_INFO "  req_gh = %s\n", (gl->gl_req_gh) ? "yes" : "no");

	printk(KERN_INFO "  req_bh = %s\n", (gl->gl_req_bh) ? "yes" : "no");

	printk(KERN_INFO "  lvb_count = %d\n", atomic_read(&gl->gl_lvb_count));

	printk(KERN_INFO "  object = %s\n", (gl->gl_object) ? "yes" : "no");

	printk(KERN_INFO "  le = %s\n",

		   (list_empty(&gl->gl_le.le_list)) ? "no" : "yes");

	printk("  reclaim = %s\n",

	printk(KERN_INFO "  reclaim = %s\n",

		    (list_empty(&gl->gl_reclaim)) ? "no" : "yes");

	if (gl->gl_aspace)

		printk("  aspace = %lu\n",

		printk(KERN_INFO "  aspace = %lu\n",

			    gl->gl_aspace->i_mapping->nrpages);

	else

		printk("  aspace = no\n");

	printk("  ail = %d\n", atomic_read(&gl->gl_ail_count));

		printk(KERN_INFO "  aspace = no\n");

	printk(KERN_INFO "  ail = %d\n", atomic_read(&gl->gl_ail_count));

	if (gl->gl_req_gh) {

		error = dump_holder("Request", gl->gl_req_gh);

		if (error)
@@ -2438,7 +2438,7 @@ static int dump_glock(struct gfs2_glock *gl) 
				goto out;

		} else {

			error = -ENOBUFS;

			printk("  Inode: busy\n");

			printk(KERN_INFO "  Inode: busy\n");

		}

	}

fs/gfs2/locking.c

+4 −5
Original line number Diff line number Diff line
@@ -46,18 +46,17 @@ int gfs_register_lockproto(struct lm_lockops *proto) 
	list_for_each_entry(lw, &lmh_list, lw_list) {

		if (!strcmp(lw->lw_ops->lm_proto_name, proto->lm_proto_name)) {

			up(&lmh_lock);

			printk("GFS2: protocol %s already exists\n",

			printk(KERN_INFO "GFS2: protocol %s already exists\n",

			       proto->lm_proto_name);

			return -EEXIST;

		}

	}



	lw = kmalloc(sizeof(struct lmh_wrapper), GFP_KERNEL);

	lw = kzalloc(sizeof(struct lmh_wrapper), GFP_KERNEL);

	if (!lw) {

		up(&lmh_lock);

		return -ENOMEM;

	}

	memset(lw, 0, sizeof(struct lmh_wrapper));



	lw->lw_ops = proto;

	list_add(&lw->lw_list, &lmh_list);
@@ -90,7 +89,7 @@ void gfs_unregister_lockproto(struct lm_lockops *proto) 


	up(&lmh_lock);



	printk("GFS2: can't unregister lock protocol %s\n",

	printk(KERN_WARNING "GFS2: can't unregister lock protocol %s\n",

	       proto->lm_proto_name);

}
@@ -136,7 +135,7 @@ int gfs2_mount_lockproto(char *proto_name, char *table_name, char *host_data, 
			request_module(proto_name);

			goto retry;

		}

		printk("GFS2: can't find protocol %s\n", proto_name);

		printk(KERN_INFO "GFS2: can't find protocol %s\n", proto_name);

		error = -ENOENT;

		goto out;

	}

fs/gfs2/locking/dlm/lock.c

+4 −3
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ static inline void gdlm_bast(void *astarg, int mode) 
	struct gdlm_ls *ls = lp->ls;



	if (!mode) {

		printk("lock_dlm: bast mode zero %x,%llx\n",

		printk(KERN_INFO "lock_dlm: bast mode zero %x,%llx\n",

			lp->lockname.ln_type, lp->lockname.ln_number);

		return;

	}
@@ -408,7 +408,7 @@ static int hold_null_lock(struct gdlm_lock *lp) 
	int error;



	if (lp->hold_null) {

		printk("lock_dlm: lvb already held\n");

		printk(KERN_INFO "lock_dlm: lvb already held\n");

		return 0;

	}
@@ -429,7 +429,8 @@ static int hold_null_lock(struct gdlm_lock *lp) 
	wait_for_completion(&lpn->ast_wait);

	error = lp->lksb.sb_status;

	if (error) {

		printk("lock_dlm: hold_null_lock dlm error %d\n", error);

		printk(KERN_INFO "lock_dlm: hold_null_lock dlm error %d\n",

		       error);

		gdlm_delete_lp(lpn);

		lpn = NULL;

	}

fs/gfs2/locking/dlm/main.c

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ int __init init_lock_dlm(void) 


	error = gfs_register_lockproto(&gdlm_ops);

	if (error) {

		printk("lock_dlm:  can't register protocol: %d\n", error);

		printk(KERN_WARNING "lock_dlm:  can't register protocol: %d\n", error);

		return error;

	}
@@ -42,7 +42,7 @@ int __init init_lock_dlm(void) 
	gdlm_drop_count = GDLM_DROP_COUNT;

	gdlm_drop_period = GDLM_DROP_PERIOD;



	printk("Lock_DLM (built %s %s) installed\n", __DATE__, __TIME__);

	printk(KERN_INFO "Lock_DLM (built %s %s) installed\n", __DATE__, __TIME__);

	return 0;

}

fs/gfs2/locking/dlm/plock.c

+7 −6
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ int gdlm_plock(lm_lockspace_t *lockspace, struct lm_lockname *name, 


	spin_lock(&ops_lock);

	if (!list_empty(&op->list)) {

		printk("plock op on list\n");

		printk(KERN_INFO "plock op on list\n");

		list_del(&op->list);

	}

	spin_unlock(&ops_lock);
@@ -127,7 +127,7 @@ int gdlm_punlock(lm_lockspace_t *lockspace, struct lm_lockname *name, 


	spin_lock(&ops_lock);

	if (!list_empty(&op->list)) {

		printk("punlock op on list\n");

		printk(KERN_INFO "punlock op on list\n");

		list_del(&op->list);

	}

	spin_unlock(&ops_lock);
@@ -162,7 +162,7 @@ int gdlm_plock_get(lm_lockspace_t *lockspace, struct lm_lockname *name, 


	spin_lock(&ops_lock);

	if (!list_empty(&op->list)) {

		printk("plock_get op on list\n");

		printk(KERN_INFO "plock_get op on list\n");

		list_del(&op->list);

	}

	spin_unlock(&ops_lock);
@@ -242,7 +242,7 @@ static ssize_t dev_write(struct file *file, const char __user *u, size_t count, 
	if (found)

		wake_up(&recv_wq);

	else

		printk("gdlm dev_write no op %x %llx\n", info.fsid,

		printk(KERN_INFO "gdlm dev_write no op %x %llx\n", info.fsid,

			info.number);

	return count;

}
@@ -285,13 +285,14 @@ int gdlm_plock_init(void) 


	rv = misc_register(&plock_dev_misc);

	if (rv)

		printk("gdlm_plock_init: misc_register failed %d", rv);

		printk(KERN_INFO "gdlm_plock_init: misc_register failed %d",

		       rv);

	return rv;

}



void gdlm_plock_exit(void)

{

	if (misc_deregister(&plock_dev_misc) < 0)

		printk("gdlm_plock_exit: misc_deregister failed");

		printk(KERN_INFO "gdlm_plock_exit: misc_deregister failed");

}