Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drbd: drop spurious parameters from _drbd_md_sync_page_io

size is always 4096,
page is always device->md_io.page.

Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>

authored by

Lars Ellenberg and committed by
Philipp Reisner
193cb00c f5b90b6b

+5 -7
+5 -7
drivers/block/drbd/drbd_actlog.c
··· 137 137 138 138 static int _drbd_md_sync_page_io(struct drbd_device *device, 139 139 struct drbd_backing_dev *bdev, 140 - struct page *page, sector_t sector, 141 - int rw, int size) 140 + sector_t sector, int rw) 142 141 { 143 142 struct bio *bio; 143 + /* we do all our meta data IO in aligned 4k blocks. */ 144 + const int size = 4096; 144 145 int err; 145 146 146 147 device->md_io.done = 0; ··· 155 154 bio->bi_bdev = bdev->md_bdev; 156 155 bio->bi_iter.bi_sector = sector; 157 156 err = -EIO; 158 - if (bio_add_page(bio, page, size, 0) != size) 157 + if (bio_add_page(bio, device->md_io.page, size, 0) != size) 159 158 goto out; 160 159 bio->bi_private = device; 161 160 bio->bi_end_io = drbd_md_io_complete; ··· 191 190 sector_t sector, int rw) 192 191 { 193 192 int err; 194 - struct page *iop = device->md_io.page; 195 - 196 193 D_ASSERT(device, atomic_read(&device->md_io.in_use) == 1); 197 194 198 195 BUG_ON(!bdev->md_bdev); ··· 206 207 current->comm, current->pid, __func__, 207 208 (unsigned long long)sector, (rw & WRITE) ? "WRITE" : "READ"); 208 209 209 - /* we do all our meta data IO in aligned 4k blocks. */ 210 - err = _drbd_md_sync_page_io(device, bdev, iop, sector, rw, 4096); 210 + err = _drbd_md_sync_page_io(device, bdev, sector, rw); 211 211 if (err) { 212 212 drbd_err(device, "drbd_md_sync_page_io(,%llus,%s) failed with error %d\n", 213 213 (unsigned long long)sector, (rw & WRITE) ? "WRITE" : "READ", err);