mm:Clean page_io revert conflict
Moto zram writeback has conflicts with mglru There is some merge error after reverted the zram writeback changes, clean it for correct logic Change-Id: I4ba5093dae7eab5ecc3cb16bab0ddfe793342306 Reviewed-on: https://gerrit.mot.com/2281591 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Xiangpo Zhao <zhaoxp3@motorola.com> Submit-Approved: Jira Key
This commit is contained in:
1 parent
62642ba9ca
commit
875fb38be8
1 file changed
+8
@@ -74,6 +74,7 @@ void end_swap_bio_write(struct bio *bio)
|
||||
bio_put(bio);
|
||||
}
|
||||
|
||||
|
||||
static void end_swap_bio_read(struct bio *bio)
|
||||
{
|
||||
struct page *page = bio_first_page_all(bio);
|
||||
@@ -337,6 +338,13 @@ int swap_readpage(struct page *page, bool synchronous)
|
||||
goto out;
|
||||
}
|
||||
|
||||
ret = bdev_read_page(sis->bdev, swap_page_sector(page), page);
|
||||
if (!ret) {
|
||||
|
||||
count_vm_event(PSWPIN);
|
||||
goto out;
|
||||
}
|
||||
|
||||
ret = 0;
|
||||
bio = get_swap_bio(GFP_KERNEL, page, end_swap_bio_read);
|
||||
if (bio == NULL) {
|
||||
|
||||
Reference in new issue
Block a user