Commit 60ae4966 authored by Philipp Reisner's avatar Philipp Reisner
Browse files

drbd: conn_printk() a dev_printk() alike for drbd's connections 



Signed-off-by: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: default avatarLars Ellenberg <lars.ellenberg@linbit.com>
parent b53339fc

drivers/block/drbd/drbd_int.h

+10 −0
Original line number Diff line number Diff line
@@ -102,6 +102,16 @@ struct drbd_tconn; 
/* to shorten dev_warn(DEV, "msg"); and relatives statements */

#define DEV (disk_to_dev(mdev->vdisk))



#define conn_printk(LEVEL, TCONN, FMT, ARGS...) \

	printk(LEVEL "d-con %s: " FMT, TCONN->name , ## ARGS)

#define conn_alert(TCONN, FMT, ARGS...)  conn_printk(KERN_ALERT, TCONN, FMT, ## ARGS)

#define conn_crit(TCONN, FMT, ARGS...)   conn_printk(KERN_CRIT, TCONN, FMT, ## ARGS)

#define conn_err(TCONN, FMT, ARGS...)    conn_printk(KERN_ERR, TCONN, FMT, ## ARGS)

#define conn_warn(TCONN, FMT, ARGS...)   conn_printk(KERN_WARNING, TCONN, FMT, ## ARGS)

#define conn_notice(TCONN, FMT, ARGS...) conn_printk(KERN_NOTICE, TCONN, FMT, ## ARGS)

#define conn_info(TCONN, FMT, ARGS...)   conn_printk(KERN_INFO, TCONN, FMT, ## ARGS)

#define conn_dbg(TCONN, FMT, ARGS...)    conn_printk(KERN_DEBUG, TCONN, FMT, ## ARGS)



#define D_ASSERT(exp)	if (!(exp)) \

	 dev_err(DEV, "ASSERT( " #exp " ) in %s:%d\n", __FILE__, __LINE__)

drivers/block/drbd/drbd_main.c

+3 −1
Original line number Diff line number Diff line
@@ -2217,12 +2217,14 @@ struct drbd_conf *drbd_new_device(unsigned int minor) 
	struct drbd_conf *mdev;

	struct gendisk *disk;

	struct request_queue *q;

	char conn_name[9]; /* drbd1234N */



	/* GFP_KERNEL, we are outside of all write-out paths */

	mdev = kzalloc(sizeof(struct drbd_conf), GFP_KERNEL);

	if (!mdev)

		return NULL;

	mdev->tconn = drbd_new_tconn("dummy");

	sprintf(conn_name, "drbd%d", minor);

	mdev->tconn = drbd_new_tconn(conn_name);

	if (!mdev->tconn)

		goto out_no_tconn;