--- nbd/include/linux/nbd.h.~1~ Fri Mar 17 17:54:34 2000 +++ nbd/include/linux/nbd.h Fri Apr 7 02:22:25 2000 @@ -39,17 +39,6 @@ #ifdef PARANOIA requests_out++; #endif - /* - * This is a very dirty hack that we have to do to handle - * merged requests because end_request stuff is a bit - * broken. The fact we have to do this only if there - * aren't errors looks even more silly. - */ - if (!req->errors) { - req->sector += req->current_nr_sectors; - req->nr_sectors -= req->current_nr_sectors; - } - spin_lock_irqsave(&io_request_lock, flags); if (end_that_request_first( req, !req->errors, "nbd" )) goto out;