Commit 97ab474c authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge branch 'md-next' of... 

Merge branch 'md-next' of git://git.kernel.org/pub/scm/linux/kernel/git/song/md into for-5.5/drivers

Pull MD changes from Song.

* 'md-next' of git://git.kernel.org/pub/scm/linux/kernel/git/song/md:
  drivers/md/raid5-ppl.c: use the new spelling of RWH_WRITE_LIFE_NOT_SET
  drivers/md/raid5.c: use the new spelling of RWH_WRITE_LIFE_NOT_SET
parents 15fbb231 0815ef3c

drivers/md/raid5-ppl.c

+1 −1
Original line number Diff line number Diff line
@@ -1404,7 +1404,7 @@ int ppl_init_log(struct r5conf *conf) 
	atomic64_set(&ppl_conf->seq, 0);

	INIT_LIST_HEAD(&ppl_conf->no_mem_stripes);

	spin_lock_init(&ppl_conf->no_mem_stripes_lock);

	ppl_conf->write_hint = RWF_WRITE_LIFE_NOT_SET;

	ppl_conf->write_hint = RWH_WRITE_LIFE_NOT_SET;



	if (!mddev->external) {

		ppl_conf->signature = ~crc32c_le(~0, mddev->uuid, sizeof(mddev->uuid));

drivers/md/raid5.c

+2 −2
Original line number Diff line number Diff line
@@ -1134,7 +1134,7 @@ again: 
			bi->bi_iter.bi_size = STRIPE_SIZE;

			bi->bi_write_hint = sh->dev[i].write_hint;

			if (!rrdev)

				sh->dev[i].write_hint = RWF_WRITE_LIFE_NOT_SET;

				sh->dev[i].write_hint = RWH_WRITE_LIFE_NOT_SET;

			/*

			 * If this is discard request, set bi_vcnt 0. We don't

			 * want to confuse SCSI because SCSI will replace payload
@@ -1187,7 +1187,7 @@ again: 
			rbi->bi_io_vec[0].bv_offset = 0;

			rbi->bi_iter.bi_size = STRIPE_SIZE;

			rbi->bi_write_hint = sh->dev[i].write_hint;

			sh->dev[i].write_hint = RWF_WRITE_LIFE_NOT_SET;

			sh->dev[i].write_hint = RWH_WRITE_LIFE_NOT_SET;

			/*

			 * If this is discard request, set bi_vcnt 0. We don't

			 * want to confuse SCSI because SCSI will replace payload

CRA Git | Maintained and supported by SUSTech CRA and CCSE