Commit 9dda0fc3 authored by Jens Axboe's avatar Jens Axboe Committed by Stephen Rothwell

mm/page_io.c: fix polled swap page in

swap_readpage() wants to do polling to bring in pages if asked to, but it
doesn't mark the bio as being polled.  Additionally, the looping around
the blk_poll() check isn't correct - if we get a zero return, we should
call io_schedule(), we can't just assume that the bio has completed.  The
regular bio->bi_private check should be used for that.

Link: http://lkml.kernel.org/r/e15243a8-2cdf-c32c-ecee-f289377c8ef9@kernel.dkSigned-off-by: default avatarJens Axboe <axboe@kernel.dk>
Reviewed-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
parent 7e4be1f4
......@@ -401,6 +401,8 @@ int swap_readpage(struct page *page, bool synchronous)
get_task_struct(current);
bio->bi_private = current;
bio_set_op_attrs(bio, REQ_OP_READ, 0);
if (synchronous)
bio->bi_opf |= REQ_HIPRI;
count_vm_event(PSWPIN);
bio_get(bio);
qc = submit_bio(bio);
......@@ -411,7 +413,7 @@ int swap_readpage(struct page *page, bool synchronous)
break;
if (!blk_poll(disk->queue, qc, true))
break;
io_schedule();
}
__set_current_state(TASK_RUNNING);
bio_put(bio);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment