diff options
| author | Christoph Hellwig <hch@lst.de> | 2002-12-04 20:22:57 -0800 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2002-12-04 20:22:57 -0800 |
| commit | fd5a2280739852fc900bb79798b5287ce2521188 (patch) | |
| tree | 01e50c6d1206df6ef6fab12f7789f6d91e629700 /include/linux | |
| parent | ff7b031902e38acaf56f8ae6119c09db8ba1761d (diff) | |
[PATCH] get rid of MAJOR_NR
In <= 2.4 some of the mess in blk.h needed it defined, but that's
long gone now.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/nbd.h | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/include/linux/nbd.h b/include/linux/nbd.h index 49e702e51f98..6785f0ff61f3 100644 --- a/include/linux/nbd.h +++ b/include/linux/nbd.h @@ -26,13 +26,6 @@ enum { NBD_CMD_DISC = 2 }; -#ifdef MAJOR_NR - -#include <asm/semaphore.h> - -#define LOCAL_END_REQUEST - -#include <linux/blk.h> #ifdef PARANOIA extern int requests_in; @@ -41,30 +34,6 @@ extern int requests_out; #define nbd_cmd(req) ((req)->cmd[0]) -static void -nbd_end_request(struct request *req) -{ - struct bio *bio; - unsigned nsect; - unsigned long flags; - int uptodate = (req->errors == 0) ? 1 : 0; - request_queue_t *q = req->q; - -#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); - } - blk_put_request(req); - spin_unlock_irqrestore(q->queue_lock, flags); -} - #define MAX_NBD 128 struct nbd_device { |