aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um
diff options
context:
space:
mode:
authorPaolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>2006-10-31 01:07:03 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-31 11:06:59 -0500
commit97d88ac83540f9ba9536326c30db4815c5b9169b (patch)
tree49b5b973b18a2f080ce030c8ea21a6b9cd77f619 /arch/um
parent36a561d6a95c4b89ae4845bf91456b4f784b6eec (diff)
[PATCH] uml ubd driver: allow using up to 16 UBD devices
With 256 minors and 16 minors used per each UBD device, we can allow the use of up to 16 UBD devices per UML. Also chnage parse_unit and leave to the caller (which already do it) the check for excess numbers, since this is just supposed to do raw parsing. Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Cc: Jeff Dike <jdike@addtoit.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/um')
-rw-r--r--arch/um/drivers/ubd_kern.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c
index bc458f57921b..54d24738280e 100644
--- a/arch/um/drivers/ubd_kern.c
+++ b/arch/um/drivers/ubd_kern.c
@@ -117,7 +117,7 @@ static int ubd_ioctl(struct inode * inode, struct file * file,
117 unsigned int cmd, unsigned long arg); 117 unsigned int cmd, unsigned long arg);
118static int ubd_getgeo(struct block_device *bdev, struct hd_geometry *geo); 118static int ubd_getgeo(struct block_device *bdev, struct hd_geometry *geo);
119 119
120#define MAX_DEV (8) 120#define MAX_DEV (16)
121 121
122static struct block_device_operations ubd_blops = { 122static struct block_device_operations ubd_blops = {
123 .owner = THIS_MODULE, 123 .owner = THIS_MODULE,
@@ -277,7 +277,7 @@ static int parse_unit(char **ptr)
277 return(-1); 277 return(-1);
278 *ptr = end; 278 *ptr = end;
279 } 279 }
280 else if (('a' <= *str) && (*str <= 'h')) { 280 else if (('a' <= *str) && (*str <= 'z')) {
281 n = *str - 'a'; 281 n = *str - 'a';
282 str++; 282 str++;
283 *ptr = str; 283 *ptr = str;