block/fs/drivers: remove rw argument from submit_bio
This has callers of submit_bio/submit_bio_wait set the bio->bi_rw instead of passing it in. This makes that use the same as generic_make_request and how we set the other bio fields. Signed-off-by: Mike Christie <mchristi@redhat.com> Fixed up fs/ext4/crypto.c Signed-off-by: Jens Axboe <axboe@fb.com>
This commit is contained in:
10
mm/page_io.c
10
mm/page_io.c
@@ -259,7 +259,7 @@ int __swap_writepage(struct page *page, struct writeback_control *wbc,
|
||||
bio_end_io_t end_write_func)
|
||||
{
|
||||
struct bio *bio;
|
||||
int ret, rw = WRITE;
|
||||
int ret;
|
||||
struct swap_info_struct *sis = page_swap_info(page);
|
||||
|
||||
if (sis->flags & SWP_FILE) {
|
||||
@@ -317,12 +317,13 @@ int __swap_writepage(struct page *page, struct writeback_control *wbc,
|
||||
ret = -ENOMEM;
|
||||
goto out;
|
||||
}
|
||||
bio->bi_rw = WRITE;
|
||||
if (wbc->sync_mode == WB_SYNC_ALL)
|
||||
rw |= REQ_SYNC;
|
||||
bio->bi_rw |= REQ_SYNC;
|
||||
count_vm_event(PSWPOUT);
|
||||
set_page_writeback(page);
|
||||
unlock_page(page);
|
||||
submit_bio(rw, bio);
|
||||
submit_bio(bio);
|
||||
out:
|
||||
return ret;
|
||||
}
|
||||
@@ -369,8 +370,9 @@ int swap_readpage(struct page *page)
|
||||
ret = -ENOMEM;
|
||||
goto out;
|
||||
}
|
||||
bio->bi_rw = READ;
|
||||
count_vm_event(PSWPIN);
|
||||
submit_bio(READ, bio);
|
||||
submit_bio(bio);
|
||||
out:
|
||||
return ret;
|
||||
}
|
||||
|
مرجع در شماره جدید
Block a user