Commit e0d245e2 authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge branch 'md-next' of... 

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

Pull MD changes from Song:

"1) iostats rewrite by Guoqing Jiang;
 2) raid5 lock contention optimization by Gal Ofri."

* 'md-next' of https://git.kernel.org/pub/scm/linux/kernel/git/song/md:
  md/raid5: avoid device_lock in read_one_chunk()
  md: add comments in md_integrity_register
  md: check level before create and exit io_acct_set
  md: Constify attribute_group structs
  md: mark some personalities as deprecated
  md/raid10: enable io accounting
  md/raid1: enable io accounting
  md/raid1: rename print_msg with r1bio_existed
  md/raid5: avoid redundant bio clone in raid5_read_one_chunk
  md/raid5: move checking badblock before clone bio in raid5_read_one_chunk
  md: add io accounting for raid0 and raid5
  md: revert io stats accounting
parents 491e5b17 97ae2725

drivers/md/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ config MD_AUTODETECT 
	  If unsure, say Y.



config MD_LINEAR

	tristate "Linear (append) mode"

	tristate "Linear (append) mode (deprecated)"

	depends on BLK_DEV_MD

	help

	  If you say Y here, then your multiple devices driver will be able to
@@ -158,7 +158,7 @@ config MD_RAID456 
	  If unsure, say Y.



config MD_MULTIPATH

	tristate "Multipath I/O support"

	tristate "Multipath I/O support (deprecated)"

	depends on BLK_DEV_MD

	help

	  MD_MULTIPATH provides a simple multi-path personality for use
@@ -169,7 +169,7 @@ config MD_MULTIPATH 
	  If unsure, say N.



config MD_FAULTY

	tristate "Faulty test module for MD"

	tristate "Faulty test module for MD (deprecated)"

	depends on BLK_DEV_MD

	help

	  The "faulty" module allows for a block device that occasionally returns

drivers/md/md-bitmap.c

+1 −1
Original line number Diff line number Diff line
@@ -2616,7 +2616,7 @@ static struct attribute *md_bitmap_attrs[] = { 
	&max_backlog_used.attr,

	NULL

};

struct attribute_group md_bitmap_group = {

const struct attribute_group md_bitmap_group = {

	.name = "bitmap",

	.attrs = md_bitmap_attrs,

};

drivers/md/md-faulty.c

+1 −1
Original line number Diff line number Diff line
@@ -357,7 +357,7 @@ static void raid_exit(void) 
module_init(raid_init);

module_exit(raid_exit);

MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("Fault injection personality for MD");

MODULE_DESCRIPTION("Fault injection personality for MD (deprecated)");

MODULE_ALIAS("md-personality-10"); /* faulty */

MODULE_ALIAS("md-faulty");

MODULE_ALIAS("md-level--5");

drivers/md/md-linear.c

+1 −1
Original line number Diff line number Diff line
@@ -312,7 +312,7 @@ static void linear_exit (void) 
module_init(linear_init);

module_exit(linear_exit);

MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("Linear device concatenation personality for MD");

MODULE_DESCRIPTION("Linear device concatenation personality for MD (deprecated)");

MODULE_ALIAS("md-personality-1"); /* LINEAR - deprecated*/

MODULE_ALIAS("md-linear");

MODULE_ALIAS("md-level--1");

drivers/md/md-multipath.c

+1 −1
Original line number Diff line number Diff line
@@ -471,7 +471,7 @@ static void __exit multipath_exit (void) 
module_init(multipath_init);

module_exit(multipath_exit);

MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("simple multi-path personality for MD");

MODULE_DESCRIPTION("simple multi-path personality for MD (deprecated)");

MODULE_ALIAS("md-personality-7"); /* MULTIPATH */

MODULE_ALIAS("md-multipath");

MODULE_ALIAS("md-level--4");