diff options
| author | Mike Christie <mchristi@redhat.com> | 2016-06-05 14:31:41 -0500 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2016-06-07 13:41:38 -0600 |
| commit | 4e49ea4a3d276365bf7396c9b77b4d1d5923835a (patch) | |
| tree | a49531413109137c3a6e40f02db7eb7969b2b672 /mm | |
| parent | af8c34ce6ae32addda3788d54a7e340cad22516b (diff) | |
| download | linux-4e49ea4a3d276365bf7396c9b77b4d1d5923835a.tar.gz | |
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>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/page_io.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/mm/page_io.c b/mm/page_io.c index 242dba07545b..5a5fd66d7bd5 100644 --- a/mm/page_io.c +++ b/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; } |