make nbd working in 2.5.x
Subsystems (2)
PATCH 1/1 make nbd working in 2.5.x
Hi Pavel,
we use nbd for our diskless systems, and it looks to me like that
it has some serious problems in 2.5.x... Can you apply this patch and forward it to Linus?
There were:
* Missing disk's queue initialization
* Driver should use list_del_init: put_request now verifies that req->queuelist is empty, and list_del was incompatible with this.
* I converted nbd_end_request back to end_that_request_{first,last} as I saw no reason why driver should do it itself... and blk_put_request has no place under queue_lock, so apparently when semantic changed nobody went through drivers... Thanks,
Petr Vandrovec [email protected]
drivers/block/nbd.c +6 -12
@@ -76,22 +76,15 @@ {int uptodate = (req->errors ==0 ) ?1 :0 ;request_queue_t *q = req->q; -struct bio *bio; -unsigned nsect;unsigned long flags;#ifdef PARANOIA requests_out++;#endif spin_lock_irqsave (q->queue_lock, flags); -while ((bio = req->bio) !=NULL ) { - nsect =bio_sectors (bio); -blk_finished_io (nsect); - req->bio = bio->bi_next; - bio->bi_next =NULL ; -bio_endio (bio, nsect <<9 , uptodate ?0 : -EIO ); +if (!end_that_request_first (req, uptodate, req->nr_sectors)) { +end_that_request_last (req); } -blk_put_request (req);spin_unlock_irqrestore (q->queue_lock, flags); }
@@ -243,7 +236,7 @@ req = list_entry(tmp, struct request, queuelist);if (req != xreq)continue ; -list_del (&req->queuelist); +list_del_init (&req->queuelist);spin_unlock (&lo->queue_lock);return req; }
@@ -322,7 +315,7 @@spin_lock (&lo->queue_lock);if (!list_empty (&lo->queue_head)) { req = list_entry(lo->queue_head.next, struct request, queuelist); -list_del (&req->queuelist); +list_del_init (&req->queuelist); }spin_unlock (&lo->queue_lock);if (req) {
@@ -387,7 +380,7 @@if (req->errors) {printk (KERN_ERR "nbd: nbd_send_req failed\n" );spin_lock (&lo->queue_lock); -list_del (&req->queuelist); +list_del_init (&req->queuelist);spin_unlock (&lo->queue_lock);nbd_end_request (req);spin_lock_irq (q->queue_lock);
@@ -592,6 +585,7 @@ disk->first_minor = i; disk->fops = &nbd_fops; disk->private_data = &nbd_dev[i]; + disk->queue = &nbd_queue;sprintf (disk->disk_name,"nbd%d" , i);set_capacity (disk,0x3ffffe );add_disk (disk);
Hi!
Quoted 4 lines
we use nbd for our diskless systems, and it looks to me like that
it has some serious problems in 2.5.x... Can you apply this patch and forward it to Linus?
Quoted 9 lines
There were:
* Missing disk's queue initialization
* Driver should uselist_del_init:put_requestnow verifies thatreq->queuelistis empty, andlist_delwas incompatible with this.
* I convertednbd_end_requestback to end_that_request_{first,last} as I saw no reason why driver should do it itself... andblk_put_requesthas no place underqueue_lock, so apparently when semantic changed nobody went through drivers...
I do not think this is good idea. I am not sure who converted it to bio, but he surely had good reason to do that.
Quoted 28 lines
diff -urdN
linux/drivers/block/nbd.clinux/drivers/block/nbd.cdrivers/block/nbd.c +2
-9@@ -76,22 +76,15 @@ {int uptodate = (req->errors ==0 ) ?1 :0 ;request_queue_t *q = req->q; -struct bio *bio; -unsigned nsect;unsigned long flags;#ifdef PARANOIA requests_out++;#endif spin_lock_irqsave (q->queue_lock, flags); -while ((bio = req->bio) !=NULL ) { - nsect =bio_sectors (bio); -blk_finished_io (nsect); - req->bio = bio->bi_next; - bio->bi_next =NULL ; -bio_endio (bio, nsect <<9 , uptodate ?0 : -EIO ); +if (!end_that_request_first (req, uptodate, req->nr_sectors)) { +end_that_request_last (req); } -blk_put_request (req);spin_unlock_irqrestore (q->queue_lock, flags); }
Signature · 2 lines
Horseback riding is like software... ...vgf orggre jura vgf serr.