Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 309bd96a authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

md: cleanup bio op / flags handling in raid1_write_request 



No need for the local variables, the bio is still live and we can just
assign the bits we want directly.  Make me wonder why we can't assign
all the bio flags to start with.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarBart Van Assche <bart.vanassche@sandisk.com>
Reviewed-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent f924ba70

drivers/md/raid1.c

+2 −5
Original line number Diff line number Diff line
@@ -1170,10 +1170,6 @@ static void raid1_write_request(struct mddev *mddev, struct bio *bio, 
	int i, disks;

	struct bitmap *bitmap = mddev->bitmap;

	unsigned long flags;

	const int op = bio_op(bio);

	const unsigned long do_sync = (bio->bi_opf & REQ_SYNC);

	const unsigned long do_flush_fua = (bio->bi_opf &

						(REQ_PREFLUSH | REQ_FUA));

	struct md_rdev *blocked_rdev;

	struct blk_plug_cb *cb;

	struct raid1_plug_cb *plug = NULL;
@@ -1389,7 +1385,8 @@ static void raid1_write_request(struct mddev *mddev, struct bio *bio, 
				   conf->mirrors[i].rdev->data_offset);

		mbio->bi_bdev = conf->mirrors[i].rdev->bdev;

		mbio->bi_end_io	= raid1_end_write_request;

		bio_set_op_attrs(mbio, op, do_flush_fua | do_sync);

		mbio->bi_opf = bio_op(bio) |

			(bio->bi_opf & (REQ_SYNC | REQ_PREFLUSH | REQ_FUA));

		if (test_bit(FailFast, &conf->mirrors[i].rdev->flags) &&

		    !test_bit(WriteMostly, &conf->mirrors[i].rdev->flags) &&

		    conf->raid_disks - mddev->degraded > 1)