Commit 4526b710 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull MD updates from Shaohua Li:
 "This update mainly fixes bugs.

   - a raid5 discard related fix from Jes
   - a MD multipath bio clone fix from Ming
   - raid1 error handling deadlock fix from Nate and corresponding
     raid10 fix from myself
   - a raid5 stripe batch fix from Neil
   - a patch from Sebastian to avoid unnecessary uevent
   - several cleanup/debug patches"

* tag 'md/4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md:
  md/raid5: Cleanup cpu hotplug notifier
  raid10: include bio_end_io_list in nr_queued to prevent freeze_array hang
  raid1: include bio_end_io_list in nr_queued to prevent freeze_array hang
  md: fix typos for stipe
  md/bitmap: remove redundant return in bitmap_checkpage
  md/raid1: remove unnecessary BUG_ON
  md: multipath: don't hardcopy bio in .make_request path
  md/raid5: output stripe state for debug
  md/raid5: preserve STRIPE_PREREAD_ACTIVE in break_stripe_batch_list
  Update MD git tree URL
  md/bitmap: remove redundant check
  MD: warn for potential deadlock
  md: Drop sending a change uevent when stopping
  RAID5: revert e9e4c377 to fix a livelock
  RAID5: check_reshape() shouldn't call mddev_suspend
  md/raid5: Compare apples to apples (or sectors to sectors)
parents 770c4c11 1d034e68

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -10291,7 +10291,7 @@ F: drivers/media/pci/solo6x10/ 
SOFTWARE RAID (Multiple Disks) SUPPORT

M:	Shaohua Li <shli@kernel.org>

L:	linux-raid@vger.kernel.org

T:	git git://neil.brown.name/md

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/shli/md.git

S:	Supported

F:	drivers/md/

F:	include/linux/raid/

drivers/md/bitmap.c

+1 −3
Original line number Diff line number Diff line
@@ -98,7 +98,6 @@ __acquires(bitmap->lock) 
		   bitmap->bp[page].hijacked) {

		/* somebody beat us to getting the page */

		kfree(mappage);

		return 0;

	} else {



		/* no page was in place and we have one, so install it */
@@ -510,8 +509,7 @@ static int bitmap_new_disk_sb(struct bitmap *bitmap) 
	sb->chunksize = cpu_to_le32(chunksize);



	daemon_sleep = bitmap->mddev->bitmap_info.daemon_sleep;

	if (!daemon_sleep ||

	    (daemon_sleep < 1) || (daemon_sleep > MAX_SCHEDULE_TIMEOUT)) {

	if (!daemon_sleep || (daemon_sleep > MAX_SCHEDULE_TIMEOUT)) {

		printk(KERN_INFO "Choosing daemon_sleep default (5 sec)\n");

		daemon_sleep = 5 * HZ;

	}

drivers/md/bitmap.h

+2 −2
Original line number Diff line number Diff line
@@ -49,8 +49,8 @@ 
 * When we set a bit, or in the counter (to start a write), if the fields is

 * 0, we first set the disk bit and set the counter to 1.

 *

 * If the counter is 0, the on-disk bit is clear and the stipe is clean

 * Anything that dirties the stipe pushes the counter to 2 (at least)

 * If the counter is 0, the on-disk bit is clear and the stripe is clean

 * Anything that dirties the stripe pushes the counter to 2 (at least)

 * and sets the on-disk bit (lazily).

 * If a periodic sweep find the counter at 2, it is decremented to 1.

 * If the sweep find the counter at 1, the on-disk bit is cleared and the

drivers/md/md.c

+1 −1
Original line number Diff line number Diff line
@@ -305,6 +305,7 @@ static blk_qc_t md_make_request(struct request_queue *q, struct bio *bio) 
 */

void mddev_suspend(struct mddev *mddev)

{

	WARN_ON_ONCE(current == mddev->thread->tsk);

	if (mddev->suspended++)

		return;

	synchronize_rcu();
@@ -5671,7 +5672,6 @@ static int do_md_stop(struct mddev *mddev, int mode, 
		export_array(mddev);



		md_clean(mddev);

		kobject_uevent(&disk_to_dev(mddev->gendisk)->kobj, KOBJ_CHANGE);

		if (mddev->hold_active == UNTIL_STOP)

			mddev->hold_active = 0;

	}

drivers/md/multipath.c

+3 −1
Original line number Diff line number Diff line
@@ -129,7 +129,9 @@ static void multipath_make_request(struct mddev *mddev, struct bio * bio) 
	}

	multipath = conf->multipaths + mp_bh->path;



	mp_bh->bio = *bio;

	bio_init(&mp_bh->bio);

	__bio_clone_fast(&mp_bh->bio, bio);



	mp_bh->bio.bi_iter.bi_sector += multipath->rdev->data_offset;

	mp_bh->bio.bi_bdev = multipath->rdev->bdev;

	mp_bh->bio.bi_rw |= REQ_FAILFAST_TRANSPORT;

CRA Git | Maintained and supported by SUSTech CRA and CCSE