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

Commit 6f37fa43 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'md/4.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md 

Pull MD fixes from Shaohua Li:
 "Several patches for MD. One notable is making flush bios sync, others
  fix small issues"

* tag 'md/4.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md:
  md: Make flush bios explicitely sync
  md: report sector of stripes with check mismatches
  md: uuid debug statement now in processor byte order.
  md-cluster: fix potential lock issue in add_new_disk
parents bb329859 5a8948f8

drivers/md/bitmap.c

+4 −4
Original line number Diff line number Diff line
@@ -485,10 +485,10 @@ void bitmap_print_sb(struct bitmap *bitmap) 
	pr_debug("         magic: %08x\n", le32_to_cpu(sb->magic));

	pr_debug("       version: %d\n", le32_to_cpu(sb->version));

	pr_debug("          uuid: %08x.%08x.%08x.%08x\n",

		 *(__u32 *)(sb->uuid+0),

		 *(__u32 *)(sb->uuid+4),

		 *(__u32 *)(sb->uuid+8),

		 *(__u32 *)(sb->uuid+12));

		 le32_to_cpu(*(__u32 *)(sb->uuid+0)),

		 le32_to_cpu(*(__u32 *)(sb->uuid+4)),

		 le32_to_cpu(*(__u32 *)(sb->uuid+8)),

		 le32_to_cpu(*(__u32 *)(sb->uuid+12)));

	pr_debug("        events: %llu\n",

		 (unsigned long long) le64_to_cpu(sb->events));

	pr_debug("events cleared: %llu\n",

drivers/md/md-cluster.c

+3 −1
Original line number Diff line number Diff line
@@ -1311,8 +1311,10 @@ static int add_new_disk(struct mddev *mddev, struct md_rdev *rdev) 
	cmsg.raid_slot = cpu_to_le32(rdev->desc_nr);

	lock_comm(cinfo, 1);

	ret = __sendmsg(cinfo, &cmsg);

	if (ret)

	if (ret) {

		unlock_comm(cinfo);

		return ret;

	}

	cinfo->no_new_dev_lockres->flags |= DLM_LKF_NOQUEUE;

	ret = dlm_lock_sync(cinfo->no_new_dev_lockres, DLM_LOCK_EX);

	cinfo->no_new_dev_lockres->flags &= ~DLM_LKF_NOQUEUE;

drivers/md/md.c

+1 −1
Original line number Diff line number Diff line
@@ -765,7 +765,7 @@ void md_super_write(struct mddev *mddev, struct md_rdev *rdev, 
	    test_bit(FailFast, &rdev->flags) &&

	    !test_bit(LastDev, &rdev->flags))

		ff = MD_FAILFAST;

	bio->bi_opf = REQ_OP_WRITE | REQ_PREFLUSH | REQ_FUA | ff;

	bio->bi_opf = REQ_OP_WRITE | REQ_SYNC | REQ_PREFLUSH | REQ_FUA | ff;



	atomic_inc(&mddev->pending_writes);

	submit_bio(bio);

drivers/md/raid5-cache.c

+2 −2
Original line number Diff line number Diff line
@@ -1782,7 +1782,7 @@ static int r5l_log_write_empty_meta_block(struct r5l_log *log, sector_t pos, 
	mb->checksum = cpu_to_le32(crc32c_le(log->uuid_checksum,

					     mb, PAGE_SIZE));

	if (!sync_page_io(log->rdev, pos, PAGE_SIZE, page, REQ_OP_WRITE,

			  REQ_FUA, false)) {

			  REQ_SYNC | REQ_FUA, false)) {

		__free_page(page);

		return -EIO;

	}
@@ -2388,7 +2388,7 @@ r5c_recovery_rewrite_data_only_stripes(struct r5l_log *log, 
		mb->checksum = cpu_to_le32(crc32c_le(log->uuid_checksum,

						     mb, PAGE_SIZE));

		sync_page_io(log->rdev, ctx->pos, PAGE_SIZE, page,

			     REQ_OP_WRITE, REQ_FUA, false);

			     REQ_OP_WRITE, REQ_SYNC | REQ_FUA, false);

		sh->log_start = ctx->pos;

		list_add_tail(&sh->r5c, &log->stripe_in_journal_list);

		atomic_inc(&log->stripe_in_journal_count);

drivers/md/raid5-ppl.c

+2 −2
Original line number Diff line number Diff line
@@ -907,8 +907,8 @@ static int ppl_write_empty_header(struct ppl_log *log) 
	pplhdr->checksum = cpu_to_le32(~crc32c_le(~0, pplhdr, PAGE_SIZE));



	if (!sync_page_io(rdev, rdev->ppl.sector - rdev->data_offset,

			  PPL_HEADER_SIZE, page, REQ_OP_WRITE | REQ_FUA, 0,

			  false)) {

			  PPL_HEADER_SIZE, page, REQ_OP_WRITE | REQ_SYNC |

			  REQ_FUA, 0, false)) {

		md_error(rdev->mddev, rdev);

		ret = -EIO;

	}