aboutsummaryrefslogtreecommitdiffstats
path: root/fs/logfs
diff options
context:
space:
mode:
Diffstat (limited to 'fs/logfs')
-rw-r--r--fs/logfs/dev_bdev.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/fs/logfs/dev_bdev.c b/fs/logfs/dev_bdev.c
index e6df3be3b31b..76279e11982d 100644
--- a/fs/logfs/dev_bdev.c
+++ b/fs/logfs/dev_bdev.c
@@ -26,9 +26,9 @@ static int sync_request(struct page *page, struct block_device *bdev, int rw)
26 bio_vec.bv_len = PAGE_SIZE; 26 bio_vec.bv_len = PAGE_SIZE;
27 bio_vec.bv_offset = 0; 27 bio_vec.bv_offset = 0;
28 bio.bi_vcnt = 1; 28 bio.bi_vcnt = 1;
29 bio.bi_size = PAGE_SIZE;
30 bio.bi_bdev = bdev; 29 bio.bi_bdev = bdev;
31 bio.bi_sector = page->index * (PAGE_SIZE >> 9); 30 bio.bi_iter.bi_sector = page->index * (PAGE_SIZE >> 9);
31 bio.bi_iter.bi_size = PAGE_SIZE;
32 32
33 return submit_bio_wait(rw, &bio); 33 return submit_bio_wait(rw, &bio);
34} 34}
@@ -92,9 +92,9 @@ static int __bdev_writeseg(struct super_block *sb, u64 ofs, pgoff_t index,
92 if (i >= max_pages) { 92 if (i >= max_pages) {
93 /* Block layer cannot split bios :( */ 93 /* Block layer cannot split bios :( */
94 bio->bi_vcnt = i; 94 bio->bi_vcnt = i;
95 bio->bi_size = i * PAGE_SIZE; 95 bio->bi_iter.bi_size = i * PAGE_SIZE;
96 bio->bi_bdev = super->s_bdev; 96 bio->bi_bdev = super->s_bdev;
97 bio->bi_sector = ofs >> 9; 97 bio->bi_iter.bi_sector = ofs >> 9;
98 bio->bi_private = sb; 98 bio->bi_private = sb;
99 bio->bi_end_io = writeseg_end_io; 99 bio->bi_end_io = writeseg_end_io;
100 atomic_inc(&super->s_pending_writes); 100 atomic_inc(&super->s_pending_writes);
@@ -119,9 +119,9 @@ static int __bdev_writeseg(struct super_block *sb, u64 ofs, pgoff_t index,
119 unlock_page(page); 119 unlock_page(page);
120 } 120 }
121 bio->bi_vcnt = nr_pages; 121 bio->bi_vcnt = nr_pages;
122 bio->bi_size = nr_pages * PAGE_SIZE; 122 bio->bi_iter.bi_size = nr_pages * PAGE_SIZE;
123 bio->bi_bdev = super->s_bdev; 123 bio->bi_bdev = super->s_bdev;
124 bio->bi_sector = ofs >> 9; 124 bio->bi_iter.bi_sector = ofs >> 9;
125 bio->bi_private = sb; 125 bio->bi_private = sb;
126 bio->bi_end_io = writeseg_end_io; 126 bio->bi_end_io = writeseg_end_io;
127 atomic_inc(&super->s_pending_writes); 127 atomic_inc(&super->s_pending_writes);
@@ -184,9 +184,9 @@ static int do_erase(struct super_block *sb, u64 ofs, pgoff_t index,
184 if (i >= max_pages) { 184 if (i >= max_pages) {
185 /* Block layer cannot split bios :( */ 185 /* Block layer cannot split bios :( */
186 bio->bi_vcnt = i; 186 bio->bi_vcnt = i;
187 bio->bi_size = i * PAGE_SIZE; 187 bio->bi_iter.bi_size = i * PAGE_SIZE;
188 bio->bi_bdev = super->s_bdev; 188 bio->bi_bdev = super->s_bdev;
189 bio->bi_sector = ofs >> 9; 189 bio->bi_iter.bi_sector = ofs >> 9;
190 bio->bi_private = sb; 190 bio->bi_private = sb;
191 bio->bi_end_io = erase_end_io; 191 bio->bi_end_io = erase_end_io;
192 atomic_inc(&super->s_pending_writes); 192 atomic_inc(&super->s_pending_writes);
@@ -205,9 +205,9 @@ static int do_erase(struct super_block *sb, u64 ofs, pgoff_t index,
205 bio->bi_io_vec[i].bv_offset = 0; 205 bio->bi_io_vec[i].bv_offset = 0;
206 } 206 }
207 bio->bi_vcnt = nr_pages; 207 bio->bi_vcnt = nr_pages;
208 bio->bi_size = nr_pages * PAGE_SIZE; 208 bio->bi_iter.bi_size = nr_pages * PAGE_SIZE;
209 bio->bi_bdev = super->s_bdev; 209 bio->bi_bdev = super->s_bdev;
210 bio->bi_sector = ofs >> 9; 210 bio->bi_iter.bi_sector = ofs >> 9;
211 bio->bi_private = sb; 211 bio->bi_private = sb;
212 bio->bi_end_io = erase_end_io; 212 bio->bi_end_io = erase_end_io;
213 atomic_inc(&super->s_pending_writes); 213 atomic_inc(&super->s_pending_writes);