aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/power
diff options
context:
space:
mode:
authorMike Christie <mchristi@redhat.com>2016-06-05 15:31:41 -0400
committerJens Axboe <axboe@fb.com>2016-06-07 15:41:38 -0400
commit4e49ea4a3d276365bf7396c9b77b4d1d5923835a (patch)
treea49531413109137c3a6e40f02db7eb7969b2b672 /kernel/power
parentaf8c34ce6ae32addda3788d54a7e340cad22516b (diff)
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 'kernel/power')
-rw-r--r--kernel/power/swap.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/power/swap.c b/kernel/power/swap.c
index 160e1006640d..be227f5aa9dc 100644
--- a/kernel/power/swap.c
+++ b/kernel/power/swap.c
@@ -271,6 +271,7 @@ static int hib_submit_io(int rw, pgoff_t page_off, void *addr,
271 bio = bio_alloc(__GFP_RECLAIM | __GFP_HIGH, 1); 271 bio = bio_alloc(__GFP_RECLAIM | __GFP_HIGH, 1);
272 bio->bi_iter.bi_sector = page_off * (PAGE_SIZE >> 9); 272 bio->bi_iter.bi_sector = page_off * (PAGE_SIZE >> 9);
273 bio->bi_bdev = hib_resume_bdev; 273 bio->bi_bdev = hib_resume_bdev;
274 bio->bi_rw = rw;
274 275
275 if (bio_add_page(bio, page, PAGE_SIZE, 0) < PAGE_SIZE) { 276 if (bio_add_page(bio, page, PAGE_SIZE, 0) < PAGE_SIZE) {
276 printk(KERN_ERR "PM: Adding page to bio failed at %llu\n", 277 printk(KERN_ERR "PM: Adding page to bio failed at %llu\n",
@@ -283,9 +284,9 @@ static int hib_submit_io(int rw, pgoff_t page_off, void *addr,
283 bio->bi_end_io = hib_end_io; 284 bio->bi_end_io = hib_end_io;
284 bio->bi_private = hb; 285 bio->bi_private = hb;
285 atomic_inc(&hb->count); 286 atomic_inc(&hb->count);
286 submit_bio(rw, bio); 287 submit_bio(bio);
287 } else { 288 } else {
288 error = submit_bio_wait(rw, bio); 289 error = submit_bio_wait(bio);
289 bio_put(bio); 290 bio_put(bio);
290 } 291 }
291 292