diff options
| author | Christoph Hellwig <hch@lst.de> | 2003-04-23 04:27:34 -0700 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2003-04-23 04:27:34 -0700 |
| commit | e3408ae9a6a48feb86956ed4a7cd1c3ef367d980 (patch) | |
| tree | 65df03cac16c699deec59fc3350281abfaea1adb /include | |
| parent | ab941afd5df16ddd5c2b36e839ce55186c11bbd0 (diff) | |
[PATCH] kill LOCAL_END_REQUEST
And uninline end_request - it's calling to many functions to be useful
inline.
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/blk.h | 16 | ||||
| -rw-r--r-- | include/linux/ide.h | 1 |
2 files changed, 1 insertions, 16 deletions
diff --git a/include/linux/blk.h b/include/linux/blk.h index 8523e8f841e3..9e65d6827d30 100644 --- a/include/linux/blk.h +++ b/include/linux/blk.h @@ -25,6 +25,7 @@ extern void rand_initialize_disk(struct gendisk *disk); extern int end_that_request_first(struct request *, int, int); extern int end_that_request_chunk(struct request *, int, int); extern void end_that_request_last(struct request *); +extern void end_request(struct request *req, int uptodate); struct request *elv_next_request(request_queue_t *q); static inline void blkdev_dequeue_request(struct request *req) @@ -37,19 +38,4 @@ static inline void blkdev_dequeue_request(struct request *req) elv_remove_request(req->q, req); } -/* - * If we have our own end_request, we do not want to include this mess - */ -#ifndef LOCAL_END_REQUEST -static inline void end_request(struct request *req, int uptodate) -{ - if (end_that_request_first(req, uptodate, req->hard_cur_sectors)) - return; - - add_disk_randomness(req->rq_disk); - blkdev_dequeue_request(req); - end_that_request_last(req); -} -#endif /* !LOCAL_END_REQUEST */ - #endif /* _BLK_H */ diff --git a/include/linux/ide.h b/include/linux/ide.h index a06f01033584..96c9ce33ce4d 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h @@ -1245,7 +1245,6 @@ extern int noautodma; * We need blk.h, but we replace its end_request by our own version. */ #define IDE_DRIVER /* Toggle some magic bits in blk.h */ -#define LOCAL_END_REQUEST /* Don't generate end_request in blk.h */ #include <linux/blk.h> extern int ide_end_request (ide_drive_t *drive, int uptodate, int nrsecs); |