Commit 4ce4c73f authored by Bart Van Assche's avatar Bart Van Assche Committed by Jens Axboe
Browse files

md/core: Combine two sync_page_io() arguments 



Improve uniformity in the kernel of handling of request operation and
flags by passing these as a single argument.

Cc: Song Liu <song@kernel.org>
Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Link: https://lore.kernel.org/r/20220714180729.1065367-32-bvanassche@acm.org


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 13a1f650

drivers/md/dm-raid.c

+1 −1
Original line number Diff line number Diff line
@@ -2036,7 +2036,7 @@ static int read_disk_sb(struct md_rdev *rdev, int size, bool force_reload) 


	rdev->sb_loaded = 0;



	if (!sync_page_io(rdev, 0, size, rdev->sb_page, REQ_OP_READ, 0, true)) {

	if (!sync_page_io(rdev, 0, size, rdev->sb_page, REQ_OP_READ, true)) {

		DMERR("Failed to read superblock of device at position %d",

		      rdev->raid_disk);

		md_error(rdev->mddev, rdev);

drivers/md/md-bitmap.c

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ static int read_sb_page(struct mddev *mddev, loff_t offset, 


		if (sync_page_io(rdev, target,

				 roundup(size, bdev_logical_block_size(rdev->bdev)),

				 page, REQ_OP_READ, 0, true)) {

				 page, REQ_OP_READ, true)) {

			page->index = index;

			return 0;

		}

drivers/md/md.c

+5 −5
Original line number Diff line number Diff line
@@ -993,15 +993,15 @@ int md_super_wait(struct mddev *mddev) 
}



int sync_page_io(struct md_rdev *rdev, sector_t sector, int size,

		 struct page *page, int op, int op_flags, bool metadata_op)

		 struct page *page, blk_opf_t opf, bool metadata_op)

{

	struct bio bio;

	struct bio_vec bvec;



	if (metadata_op && rdev->meta_bdev)

		bio_init(&bio, rdev->meta_bdev, &bvec, 1, op | op_flags);

		bio_init(&bio, rdev->meta_bdev, &bvec, 1, opf);

	else

		bio_init(&bio, rdev->bdev, &bvec, 1, op | op_flags);

		bio_init(&bio, rdev->bdev, &bvec, 1, opf);



	if (metadata_op)

		bio.bi_iter.bi_sector = sector + rdev->sb_start;
@@ -1024,7 +1024,7 @@ static int read_disk_sb(struct md_rdev *rdev, int size) 
	if (rdev->sb_loaded)

		return 0;



	if (!sync_page_io(rdev, 0, size, rdev->sb_page, REQ_OP_READ, 0, true))

	if (!sync_page_io(rdev, 0, size, rdev->sb_page, REQ_OP_READ, true))

		goto fail;

	rdev->sb_loaded = 1;

	return 0;
@@ -1722,7 +1722,7 @@ static int super_1_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor_ 
			return -EINVAL;

		bb_sector = (long long)offset;

		if (!sync_page_io(rdev, bb_sector, sectors << 9,

				  rdev->bb_page, REQ_OP_READ, 0, true))

				  rdev->bb_page, REQ_OP_READ, true))

			return -EIO;

		bbp = (__le64 *)page_address(rdev->bb_page);

		rdev->badblocks.shift = sb->bblog_shift;

drivers/md/md.h

+1 −2
Original line number Diff line number Diff line
@@ -738,8 +738,7 @@ extern void md_super_write(struct mddev *mddev, struct md_rdev *rdev, 
			   sector_t sector, int size, struct page *page);

extern int md_super_wait(struct mddev *mddev);

extern int sync_page_io(struct md_rdev *rdev, sector_t sector, int size,

			struct page *page, int op, int op_flags,

			bool metadata_op);

		struct page *page, blk_opf_t opf, bool metadata_op);

extern void md_do_sync(struct md_thread *thread);

extern void md_new_event(void);

extern void md_allow_write(struct mddev *mddev);

drivers/md/raid1.c

+4 −4
Original line number Diff line number Diff line
@@ -1990,7 +1990,7 @@ static void end_sync_write(struct bio *bio) 
static int r1_sync_page_io(struct md_rdev *rdev, sector_t sector,

			   int sectors, struct page *page, int rw)

{

	if (sync_page_io(rdev, sector, sectors << 9, page, rw, 0, false))

	if (sync_page_io(rdev, sector, sectors << 9, page, rw, false))

		/* success */

		return 1;

	if (rw == WRITE) {
@@ -2057,7 +2057,7 @@ static int fix_sync_read_error(struct r1bio *r1_bio) 
				rdev = conf->mirrors[d].rdev;

				if (sync_page_io(rdev, sect, s<<9,

						 pages[idx],

						 REQ_OP_READ, 0, false)) {

						 REQ_OP_READ, false)) {

					success = 1;

					break;

				}
@@ -2305,7 +2305,7 @@ static void fix_read_error(struct r1conf *conf, int read_disk, 
				atomic_inc(&rdev->nr_pending);

				rcu_read_unlock();

				if (sync_page_io(rdev, sect, s<<9,

					 conf->tmppage, REQ_OP_READ, 0, false))

					 conf->tmppage, REQ_OP_READ, false))

					success = 1;

				rdev_dec_pending(rdev, mddev);

				if (success)