Re: [PATCH 1/1] NBD: raise max number of nbd devices to 1024

Paul Clements
2008-01-30T02:04:18Z

[-- Attachment #1: Type: text/plain, Size: 277 bytes --]

Andrew Morton wrote:

<snip>

> much nicer?

OK, yes, I was going for quick and easy, but you've got a point...

We do need to move the kcalloc into nbd_init instead of nbd_cleanup,
though -- that works a little better. Patch is attached. Thanks for the
suggestion.

--
Paul

[-- Attachment #2: nbd_max_nbd_killed.diff --]
[-- Type: text/x-patch, Size: 1189 bytes --]

Signed-Off-By: Paul Clements <paul.clements@steeleye.com>

--- ./include/linux/nbd.h.TIMEOUT 2007-08-22 13:18:12.000000000 -0400
+++ ./include/linux/nbd.h 2008-01-29 20:01:33.000000000 -0500
@@ -35,7 +35,6 @@ enum {
};

#define nbd_cmd(req) ((req)->cmd[0])
-#define MAX_NBD 128

/* userspace doesn't need the nbd_device structure */
#ifdef __KERNEL__
--- ./drivers/block/nbd.c.ORIG 2008-01-29 20:01:12.000000000 -0500
+++ ./drivers/block/nbd.c 2008-01-29 20:08:30.000000000 -0500
@@ -53,7 +53,7 @@ static unsigned int debugflags;
#endif /* NDEBUG */

static unsigned int nbds_max = 16;
-static struct nbd_device nbd_dev[MAX_NBD];
+static struct nbd_device *nbd_dev;

/*
* Use just one lock (or at most 1 per NIC). Two arguments for this:
@@ -659,11 +659,9 @@ static int __init nbd_init(void)