diff options
| author | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 19:12:19 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 19:12:19 -0800 |
| commit | 7b4d3039dfd2cbfa15127c29dcb557f314d13db1 (patch) | |
| tree | 31d8a48158c92b967fd4acec936cb19ee847f531 /include/linux/blkdev.h | |
| parent | fff10634980710b1edd0c849b8478d3f5ec5ee95 (diff) | |
v2.4.6.8 -> v2.4.6.9
- Dan Quinlan: cramfs update
- Ben Collins: IEEE 1394 update
- David Miller: network update (pppoe, routing cache stats), sparc32 update
- me: only dump core once per threaded app (first one wins)
- me: use new completion handlers for block device requests (same race
as with vfork, see -pre7)
Diffstat (limited to 'include/linux/blkdev.h')
| -rw-r--r-- | include/linux/blkdev.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 5214a6ecff13..3fd98287a093 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -15,8 +15,8 @@ typedef struct elevator_s elevator_t; /* * Ok, this is an expanded form so that we can use the same * request for paging requests when that is implemented. In - * paging, 'bh' is NULL, and the semaphore is used to wait - * for read/write completion. + * paging, 'bh' is NULL, and the completion is used to wait + * for the IO to be ready. */ struct request { struct list_head queue; @@ -41,7 +41,7 @@ struct request { unsigned long current_nr_sectors; void * special; char * buffer; - struct semaphore * sem; + struct completion * waiting; struct buffer_head * bh; struct buffer_head * bhtail; request_queue_t *q; |