projects
/
linux-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
block/fs/drivers: remove rw argument from submit_bio
[linux-block.git]
/
kernel
/
power
/
swap.c
diff --git
a/kernel/power/swap.c
b/kernel/power/swap.c
index 160e1006640d585f417ae37ecab304e407971e67..be227f5aa9dcf12cbd7af3af866d02285390bc92 100644
(file)
--- 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,
bio = bio_alloc(__GFP_RECLAIM | __GFP_HIGH, 1);
bio->bi_iter.bi_sector = page_off * (PAGE_SIZE >> 9);
bio->bi_bdev = hib_resume_bdev;
bio = bio_alloc(__GFP_RECLAIM | __GFP_HIGH, 1);
bio->bi_iter.bi_sector = page_off * (PAGE_SIZE >> 9);
bio->bi_bdev = hib_resume_bdev;
+ bio->bi_rw = rw;
if (bio_add_page(bio, page, PAGE_SIZE, 0) < PAGE_SIZE) {
printk(KERN_ERR "PM: Adding page to bio failed at %llu\n",
if (bio_add_page(bio, page, PAGE_SIZE, 0) < PAGE_SIZE) {
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,
bio->bi_end_io = hib_end_io;
bio->bi_private = hb;
atomic_inc(&hb->count);
bio->bi_end_io = hib_end_io;
bio->bi_private = hb;
atomic_inc(&hb->count);
- submit_bio(
rw,
bio);
+ submit_bio(bio);
} else {
} else {
- error = submit_bio_wait(
rw,
bio);
+ error = submit_bio_wait(bio);
bio_put(bio);
}
bio_put(bio);
}