diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-24 12:26:44 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-24 12:26:44 -0700 |
commit | b2e961eb2e7a54ffaae82f8e0198b26b54ade98e (patch) | |
tree | 33e5192a4c84e717d8c2f8235f268216b01053f7 /drivers/block/loop.c | |
parent | b8c1c5da1520977cb55a358f20fc09567d40cad9 (diff) | |
parent | 71f65e6bd7651610d2d6aeb3c12aab63667ace30 (diff) |
Merge branch 'request-queue-t' of git://git.kernel.dk/linux-2.6-block
* 'request-queue-t' of git://git.kernel.dk/linux-2.6-block:
[BLOCK] Add request_queue_t and mark it deprecated
[BLOCK] Get rid of request_queue_t typedef
Diffstat (limited to 'drivers/block/loop.c')
-rw-r--r-- | drivers/block/loop.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/loop.c b/drivers/block/loop.c index e425daa1eac3..9f015fce4135 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -529,7 +529,7 @@ static struct bio *loop_get_bio(struct loop_device *lo) return bio; } -static int loop_make_request(request_queue_t *q, struct bio *old_bio) +static int loop_make_request(struct request_queue *q, struct bio *old_bio) { struct loop_device *lo = q->queuedata; int rw = bio_rw(old_bio); @@ -558,7 +558,7 @@ out: /* * kick off io on the underlying address space */ -static void loop_unplug(request_queue_t *q) +static void loop_unplug(struct request_queue *q) { struct loop_device *lo = q->queuedata; |