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

Commit 47f521ba authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md 

Pull MD update from Shaohua Li:
 "This update mostly includes bug fixes:

   - md-cluster now supports raid10 from Guoqing

   - raid5 PPL fixes from Artur

   - badblock regression fix from Bo

   - suspend hang related fixes from Neil

   - raid5 reshape fixes from Neil

   - raid1 freeze deadlock fix from Nate

   - memleak fixes from Zdenek

   - bitmap related fixes from Me and Tao

   - other fixes and cleanups"

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md: (33 commits)
  md: free unused memory after bitmap resize
  md: release allocated bitset sync_set
  md/bitmap: clear BITMAP_WRITE_ERROR bit before writing it to sb
  md: be cautious about using ->curr_resync_completed for ->recovery_offset
  badblocks: fix wrong return value in badblocks_set if badblocks are disabled
  md: don't check MD_SB_CHANGE_CLEAN in md_allow_write
  md-cluster: update document for raid10
  md: remove redundant variable q
  raid1: remove obsolete code in raid1_write_request
  md-cluster: Use a small window for raid10 resync
  md-cluster: Suspend writes in RAID10 if within range
  md-cluster/raid10: set "do_balance = 0" if area is resyncing
  md: use lockdep_assert_held
  raid1: prevent freeze_array/wait_all_barriers deadlock
  md: use TASK_IDLE instead of blocking signals
  md: remove special meaning of ->quiesce(.., 2)
  md: allow metadata update while suspending.
  md: use mddev_suspend/resume instead of ->quiesce()
  md: move suspend_hi/lo handling into core md code
  md: don't call bitmap_create() while array is quiesced.
  ...
parents b91593fa 0868b99c

Documentation/md/md-cluster.txt

+2 −1
Original line number Diff line number Diff line 
The cluster MD is a shared-device RAID for a cluster.

The cluster MD is a shared-device RAID for a cluster, it supports

two levels: raid1 and raid10 (limited support).





1. On-disk format

MAINTAINERS

+6 −1
Original line number Diff line number Diff line
@@ -4103,6 +4103,8 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git 
T:	quilt http://people.redhat.com/agk/patches/linux/editing/

S:	Maintained

F:	Documentation/device-mapper/

F:	drivers/md/Makefile

F:	drivers/md/Kconfig

F:	drivers/md/dm*

F:	drivers/md/persistent-data/

F:	include/linux/device-mapper.h
@@ -12487,7 +12489,10 @@ M: Shaohua Li <shli@kernel.org> 
L:	linux-raid@vger.kernel.org

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

S:	Supported

F:	drivers/md/

F:	drivers/md/Makefile

F:	drivers/md/Kconfig

F:	drivers/md/md*

F:	drivers/md/raid*

F:	include/linux/raid/

F:	include/uapi/linux/raid/

block/badblocks.c

+1 −1
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ int badblocks_set(struct badblocks *bb, sector_t s, int sectors, 


	if (bb->shift < 0)

		/* badblocks are disabled */

		return 0;

		return 1;



	if (bb->shift) {

		/* round the start down, and the end up */

drivers/md/Kconfig

+3 −2
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ config MD_FAULTY 




config MD_CLUSTER

	tristate "Cluster Support for MD (EXPERIMENTAL)"

	tristate "Cluster Support for MD"

	depends on BLK_DEV_MD

	depends on DLM

	default n
@@ -188,7 +188,8 @@ config MD_CLUSTER 
	nodes in the cluster can access the MD devices simultaneously.



	This brings the redundancy (and uptime) of RAID levels across the

	nodes of the cluster.

	nodes of the cluster. Currently, it can work with raid1 and raid10

	(limited support).



	If unsure, say N.

drivers/md/Makefile

+4 −1
Original line number Diff line number Diff line
@@ -19,9 +19,12 @@ dm-cache-y += dm-cache-target.o dm-cache-metadata.o dm-cache-policy.o \ 
dm-cache-smq-y   += dm-cache-policy-smq.o

dm-era-y	+= dm-era-target.o

dm-verity-y	+= dm-verity-target.o

md-mod-y	+= md.o bitmap.o

md-mod-y	+= md.o md-bitmap.o

raid456-y	+= raid5.o raid5-cache.o raid5-ppl.o

dm-zoned-y	+= dm-zoned-target.o dm-zoned-metadata.o dm-zoned-reclaim.o

linear-y	+= md-linear.o

multipath-y	+= md-multipath.o

faulty-y	+= md-faulty.o



# Note: link order is important.  All raid personalities

# and must come before md.o, as they each initialise