Commit 894bcdfb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://neil.brown.name/md 

* 'for-linus' of git://neil.brown.name/md:
  md: don't retry recovery of raid1 that fails due to error on source drive.
  md: Allow md devices to be created by name.
  md: make devices disappear when they are no longer needed.
  md: centralise all freeing of an 'mddev' in 'md_free'
  md: move allocation of ->queue from mddev_find to md_probe
  md: need another print_sb for mdp_superblock_1
  md: use list_for_each_entry macro directly
  md: raid0: make hash_spacing and preshift sector-based.
  md: raid0: Represent the size of strip zones in sectors.
  md: raid0 create_strip_zones(): Add KERN_INFO/KERN_ERR to printk's.
  md: raid0 create_strip_zones(): Make two local variables sector-based.
  md: raid0: Represent zone->zone_offset in sectors.
  md: raid0: Represent device offset in sectors.
  md: raid0_make_request(): Replace local variable block by sector.
  md: raid0_make_request(): Remove local variable chunk_size.
  md: raid0_make_request(): Replace chunksize_bits by chunksect_bits.
  md: use sysfs_notify_dirent to notify changes to md/sync_action.
  md: fix bitmap-on-external-file bug.
parents a419df8a 4044ba58

drivers/md/bitmap.c

+6 −5
Original line number Diff line number Diff line
@@ -215,7 +215,6 @@ static struct page *read_sb_page(mddev_t *mddev, long offset, 
	/* choose a good rdev and read the page from there */



	mdk_rdev_t *rdev;

	struct list_head *tmp;

	sector_t target;



	if (!page)
@@ -223,7 +222,7 @@ static struct page *read_sb_page(mddev_t *mddev, long offset, 
	if (!page)

		return ERR_PTR(-ENOMEM);



	rdev_for_each(rdev, tmp, mddev) {

	list_for_each_entry(rdev, &mddev->disks, same_set) {

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

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

			continue;
@@ -964,7 +963,9 @@ static int bitmap_init_from_disk(struct bitmap *bitmap, sector_t start) 
				 */

				page = bitmap->sb_page;

				offset = sizeof(bitmap_super_t);

				read_sb_page(bitmap->mddev, bitmap->offset,

				if (!file)

					read_sb_page(bitmap->mddev,

						     bitmap->offset,

						     page,

						     index, count);

			} else if (file) {

drivers/md/faulty.c

+1 −2
Original line number Diff line number Diff line
@@ -283,7 +283,6 @@ static int reconfig(mddev_t *mddev, int layout, int chunk_size) 
static int run(mddev_t *mddev)

{

	mdk_rdev_t *rdev;

	struct list_head *tmp;

	int i;



	conf_t *conf = kmalloc(sizeof(*conf), GFP_KERNEL);
@@ -296,7 +295,7 @@ static int run(mddev_t *mddev) 
	}

	conf->nfaults = 0;



	rdev_for_each(rdev, tmp, mddev)

	list_for_each_entry(rdev, &mddev->disks, same_set)

		conf->rdev = rdev;



	mddev->array_sectors = mddev->size * 2;

drivers/md/linear.c

+1 −2
Original line number Diff line number Diff line
@@ -105,7 +105,6 @@ static linear_conf_t *linear_conf(mddev_t *mddev, int raid_disks) 
	int i, nb_zone, cnt;

	sector_t min_sectors;

	sector_t curr_sector;

	struct list_head *tmp;



	conf = kzalloc (sizeof (*conf) + raid_disks*sizeof(dev_info_t),

			GFP_KERNEL);
@@ -115,7 +114,7 @@ static linear_conf_t *linear_conf(mddev_t *mddev, int raid_disks) 
	cnt = 0;

	conf->array_sectors = 0;



	rdev_for_each(rdev, tmp, mddev) {

	list_for_each_entry(rdev, &mddev->disks, same_set) {

		int j = rdev->raid_disk;

		dev_info_t *disk = conf->disks + j;

drivers/md/md.c

+293 −123

File changed.

Preview size limit exceeded, changes collapsed.

drivers/md/multipath.c

+1 −2

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE