renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-18 10:13:57 +08:00
Code

dm: remove dm_request loop

Browse Source 
Remove queue_io return value and a loop in dm_request.

IO may be submitted to a worker thread with queue_io().  queue_io() sets
DMF_QUEUE_IO_TO_THREAD so that all further IO is queued for the thread. When
the thread finishes its work, it clears DMF_QUEUE_IO_TO_THREAD and from this
point on, requests are submitted from dm_request again. This will be used
for processing barriers.

Remove the loop in dm_request. queue_io() can submit I/Os to the worker thread
even if DMF_QUEUE_IO_TO_THREAD was not set.

Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>
This commit is contained in:
Mikulas Patocka 2009-04-09 00:27:15 +01:00 committed by Alasdair G Kergon
parent 3b00b2036f
commit 92c639021c
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/md/dm.c
View File

@ -436,21 +436,18 @@ static void end_io_acct(struct dm_io *io)
/* /*
* Add the bio to the list of deferred io. * Add the bio to the list of deferred io.
*/ */
static int queue_io(struct mapped_device *md, struct bio *bio) static void queue_io(struct mapped_device *md, struct bio *bio)
{ {
down_write(&md->io_lock); down_write(&md->io_lock);
if (!test_bit(DMF_QUEUE_IO_TO_THREAD, &md->flags)) {
up_write(&md->io_lock);
return 1;
}
spin_lock_irq(&md->deferred_lock); spin_lock_irq(&md->deferred_lock);
bio_list_add(&md->deferred, bio); bio_list_add(&md->deferred, bio);
spin_unlock_irq(&md->deferred_lock); spin_unlock_irq(&md->deferred_lock);
if (!test_and_set_bit(DMF_QUEUE_IO_TO_THREAD, &md->flags))
queue_work(md->wq, &md->work);
up_write(&md->io_lock); up_write(&md->io_lock);
return 0; /* deferred successfully */
} }
/* /*
@ -953,7 +950,7 @@ static int dm_request(struct request_queue *q, struct bio *bio)
* If we're suspended or the thread is processing barriers * If we're suspended or the thread is processing barriers
* we have to queue this io for later. * we have to queue this io for later.
*/ */
while (test_bit(DMF_QUEUE_IO_TO_THREAD, &md->flags)) { if (unlikely(test_bit(DMF_QUEUE_IO_TO_THREAD, &md->flags))) {
up_read(&md->io_lock); up_read(&md->io_lock);
if (unlikely(test_bit(DMF_BLOCK_IO_FOR_SUSPEND, &md->flags)) && if (unlikely(test_bit(DMF_BLOCK_IO_FOR_SUSPEND, &md->flags)) &&
@ -962,14 +959,9 @@ static int dm_request(struct request_queue *q, struct bio *bio)
return 0; return 0;
} }
if (!queue_io(md, bio)) queue_io(md, bio);
return 0;
/* return 0;
* We're in a while loop, because someone could suspend
* before we get to the following read lock.
*/
down_read(&md->io_lock);
} }
__split_and_process_bio(md, bio); __split_and_process_bio(md, bio);