From 36090d976e91c844c8007de060c9afd3a6ed041b Mon Sep 17 00:00:00 2001 From: Philipp Reisner Date: Mon, 10 Jan 2011 11:15:17 +0100 Subject: [PATCH] --- yaml --- r: 242887 b: refs/heads/master c: 2b8a90b55533c66258a1ff0fb27b8cffa95665c4 h: refs/heads/master i: 242885: 4df52e7fbc6d62d2df8fc9a44d16b0c85f645be4 242883: 7b432f8b4b3eaea609fd99e39464f6898657fe64 242879: eb8ccdc6201b05033640e4d3b0349bed7a0555c1 v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_main.c | 7 ++++--- trunk/include/linux/drbd_limits.h | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 8bcbff36a21b..d1a20b49ec62 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 110a204a354a5a69f99ed0bc8e6d779e6a94d410 +refs/heads/master: 2b8a90b55533c66258a1ff0fb27b8cffa95665c4 diff --git a/trunk/drivers/block/drbd/drbd_main.c b/trunk/drivers/block/drbd/drbd_main.c index 4074d6699307..da98bff7c333 100644 --- a/trunk/drivers/block/drbd/drbd_main.c +++ b/trunk/drivers/block/drbd/drbd_main.c @@ -85,7 +85,8 @@ MODULE_AUTHOR("Philipp Reisner , " MODULE_DESCRIPTION("drbd - Distributed Replicated Block Device v" REL_VERSION); MODULE_VERSION(REL_VERSION); MODULE_LICENSE("GPL"); -MODULE_PARM_DESC(minor_count, "Maximum number of drbd devices (1-255)"); +MODULE_PARM_DESC(minor_count, "Maximum number of drbd devices (" + __stringify(DRBD_MINOR_COUNT_MIN) "-" __stringify(DRBD_MINOR_COUNT_MAX) ")"); MODULE_ALIAS_BLOCKDEV_MAJOR(DRBD_MAJOR); #include @@ -115,7 +116,7 @@ module_param(fault_devs, int, 0644); #endif /* module parameter, defined */ -unsigned int minor_count = 32; +unsigned int minor_count = DRBD_MINOR_COUNT_DEF; int disable_sendpage; int allow_oos; unsigned int cn_idx = CN_IDX_DRBD; @@ -3456,7 +3457,7 @@ int __init drbd_init(void) return -EINVAL; } - if (1 > minor_count || minor_count > 255) { + if (minor_count < DRBD_MINOR_COUNT_MIN || minor_count > DRBD_MINOR_COUNT_MAX) { printk(KERN_ERR "drbd: invalid minor_count (%d)\n", minor_count); #ifdef MODULE diff --git a/trunk/include/linux/drbd_limits.h b/trunk/include/linux/drbd_limits.h index abf418724e52..bb264a5732de 100644 --- a/trunk/include/linux/drbd_limits.h +++ b/trunk/include/linux/drbd_limits.h @@ -16,7 +16,8 @@ #define DEBUG_RANGE_CHECK 0 #define DRBD_MINOR_COUNT_MIN 1 -#define DRBD_MINOR_COUNT_MAX 255 +#define DRBD_MINOR_COUNT_MAX 256 +#define DRBD_MINOR_COUNT_DEF 32 #define DRBD_DIALOG_REFRESH_MIN 0 #define DRBD_DIALOG_REFRESH_MAX 600