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

Commit 058fc47e authored by Tejun Heo's avatar Tejun Heo
Browse files

Merge branch 'for-4.13-fixes' into for-4.14

parents c5a94a61 1ad0f0a7

drivers/md/bitmap.c

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


	rdev_for_each(rdev, mddev) {

		if (! test_bit(In_sync, &rdev->flags)

		    || test_bit(Faulty, &rdev->flags))

		    || test_bit(Faulty, &rdev->flags)

		    || test_bit(Bitmap_sync, &rdev->flags))

			continue;



		target = offset + index * (PAGE_SIZE/512);

drivers/md/md.h

+3 −1
Original line number Diff line number Diff line
@@ -134,7 +134,9 @@ enum flag_bits { 
	Faulty,			/* device is known to have a fault */

	In_sync,		/* device is in_sync with rest of array */

	Bitmap_sync,		/* ..actually, not quite In_sync.  Need a

				 * bitmap-based recovery to get fully in sync

				 * bitmap-based recovery to get fully in sync.

				 * The bit is only meaningful before device

				 * has been passed to pers->hot_add_disk.

				 */

	WriteMostly,		/* Avoid reading if at all possible */

	AutoDetected,		/* added by auto-detect */

drivers/md/raid5-ppl.c

+1 −1
Original line number Diff line number Diff line
@@ -1150,7 +1150,7 @@ int ppl_init_log(struct r5conf *conf) 
		goto err;

	}



	ppl_conf->bs = bioset_create(conf->raid_disks, 0, 0);

	ppl_conf->bs = bioset_create(conf->raid_disks, 0, BIOSET_NEED_BVECS);

	if (!ppl_conf->bs) {

		ret = -ENOMEM;

		goto err;

drivers/md/raid5.c

+1 −3
Original line number Diff line number Diff line
@@ -7951,12 +7951,10 @@ static void end_reshape(struct r5conf *conf) 
{



	if (!test_bit(MD_RECOVERY_INTR, &conf->mddev->recovery)) {

		struct md_rdev *rdev;



		spin_lock_irq(&conf->device_lock);

		conf->previous_raid_disks = conf->raid_disks;

		rdev_for_each(rdev, conf->mddev)

			rdev->data_offset = rdev->new_data_offset;

		md_finish_reshape(conf->mddev);

		smp_wmb();

		conf->reshape_progress = MaxSector;

		conf->mddev->reshape_position = MaxSector;

include/linux/workqueue.h

+3 −1
Original line number Diff line number Diff line
@@ -323,6 +323,7 @@ enum { 


	__WQ_DRAINING		= 1 << 16, /* internal: workqueue is draining */

	__WQ_ORDERED		= 1 << 17, /* internal: workqueue is ordered */

	__WQ_ORDERED_EXPLICIT	= 1 << 18, /* internal: alloc_ordered_workqueue() */

	__WQ_LEGACY		= 1 << 18, /* internal: create*_workqueue() */



	WQ_MAX_ACTIVE		= 512,	  /* I like 512, better ideas? */
@@ -422,7 +423,8 @@ __alloc_workqueue_key(const char *fmt, unsigned int flags, int max_active, 
 * Pointer to the allocated workqueue on success, %NULL on failure.

 */

#define alloc_ordered_workqueue(fmt, flags, args...)			\

	alloc_workqueue(fmt, WQ_UNBOUND | __WQ_ORDERED | (flags), 1, ##args)

	alloc_workqueue(fmt, WQ_UNBOUND | __WQ_ORDERED |		\

			__WQ_ORDERED_EXPLICIT | (flags), 1, ##args)



#define create_workqueue(name)						\

	alloc_workqueue("%s", __WQ_LEGACY | WQ_MEM_RECLAIM, 1, (name))