Messages in this thread Patch in this message | | | From | Steve Whitehouse <> | Subject | Re: NBD Cleanup patch and bugfix in ll_rw_blk.c | Date | Sun, 25 Feb 2001 23:02:41 +0000 (GMT) |
| |
Hi,
Oops, sorry. Updated patch below. Jens & Russell: Thanks for pointing this out,
Steve.
> > On Sun, Feb 25 2001, Russell King wrote: > > On Sun, Feb 25, 2001 at 07:57:29PM +0000, Steve Whitehouse wrote: > > > -int nbd_init(void) > > > +int __init nbd_init(void) > > > > > -void cleanup_module(void) > > > +void __exit nbd_cleanup(void) > > > > > + > > > +module_init(nbd_init); > > > +module_exit(nbd_cleanup); > > > > If you're using module_init/module_exit, shouldn't nbd_init/nbd_cleanup > > be declared statically? > > And more importantly, the init calls from ll_rw_blk.c:blk_dev_init() > should be removed too. > > -- > Jens Axboe >
-----------------------------------------------------------------------------
diff -u -r linux-2.4.2/drivers/block/ll_rw_blk.c linux/drivers/block/ll_rw_blk.c --- linux-2.4.2/drivers/block/ll_rw_blk.c Thu Feb 22 19:46:23 2001 +++ linux/drivers/block/ll_rw_blk.c Sun Feb 25 23:05:30 2001 @@ -588,6 +588,9 @@ * inserted at elevator_merge time */ list_add(&req->queue, insert_here); + + if (!q->plugged && insert_here == &q->queue_head) + q->request_fn(q); } void inline blk_refill_freelist(request_queue_t *q, int rw) @@ -1320,9 +1323,6 @@ #endif #ifdef CONFIG_DDV ddv_init(); -#endif -#ifdef CONFIG_BLK_DEV_NBD - nbd_init(); #endif #ifdef CONFIG_MDISK mdisk_init(); diff -u -r linux-2.4.2/drivers/block/nbd.c linux/drivers/block/nbd.c --- linux-2.4.2/drivers/block/nbd.c Mon Oct 30 22:30:33 2000 +++ linux/drivers/block/nbd.c Sun Feb 25 23:05:19 2001 @@ -29,7 +29,7 @@ #include <linux/major.h> #include <linux/module.h> - +#include <linux/init.h> #include <linux/sched.h> #include <linux/fs.h> #include <linux/stat.h> @@ -149,12 +149,13 @@ { int result; struct nbd_request request; + unsigned long size = req->current_nr_sectors << 9; DEBUG("NBD: sending control, "); request.magic = htonl(NBD_REQUEST_MAGIC); request.type = htonl(req->cmd); request.from = cpu_to_be64( (u64) req->sector << 9); - request.len = htonl(req->current_nr_sectors << 9); + request.len = htonl(size); memcpy(request.handle, &req, sizeof(req)); result = nbd_xmit(1, sock, (char *) &request, sizeof(request)); @@ -163,7 +164,7 @@ if (req->cmd == WRITE) { DEBUG("data, "); - result = nbd_xmit(1, sock, req->buffer, req->current_nr_sectors << 9); + result = nbd_xmit(1, sock, req->buffer, size); if (result <= 0) FAIL("Send data failed."); } @@ -475,11 +476,7 @@ * (Just smiley confuses emacs :-) */ -#ifdef MODULE -#define nbd_init init_module -#endif - -int nbd_init(void) +static int __init nbd_init(void) { int i; @@ -526,8 +523,7 @@ return 0; } -#ifdef MODULE -void cleanup_module(void) +static void __exit nbd_cleanup(void) { devfs_unregister (devfs_handle); blk_cleanup_queue(BLK_DEFAULT_QUEUE(MAJOR_NR)); @@ -537,4 +533,9 @@ else printk("nbd: module cleaned up.\n"); } -#endif + +module_init(nbd_init); +module_exit(nbd_cleanup); + +MODULE_DESCRIPTION("Network Block Device"); + - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |