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

Merge tag 'md-6.11-20240612' of... 

Merge tag 'md-6.11-20240612' of git://git.kernel.org/pub/scm/linux/kernel/git/song/md into for-6.11/block

Pull MD updates from Song:

"The major changes in this PR are:

 - sync_action fix and refactoring, by Yu Kuai;
 - Various small fixes by Christoph Hellwig, Li Nan, and Ofir Gal."

* tag 'md-6.11-20240612' of git://git.kernel.org/pub/scm/linux/kernel/git/song/md:
  md/raid5: avoid BUG_ON() while continue reshape after reassembling
  md: pass in max_sectors for pers->sync_request()
  md: factor out helpers for different sync_action in md_do_sync()
  md: replace last_sync_action with new enum type
  md: use new helpers in md_do_sync()
  md: don't fail action_store() if sync_thread is not registered
  md: remove parameter check_seq for stop_sync_thread()
  md: replace sysfs api sync_action with new helpers
  md: factor out helper to start reshape from action_store()
  md: add new helpers for sync_action
  md: add a new enum type sync_action
  md: rearrange recovery_flags
  md/md-bitmap: fix writing non bitmap pages
  md/raid1: don't free conf on raid0_run failure
  md/raid0: don't free conf on raid0_run failure
  md: make md_flush_request() more readable
  md: fix deadlock between mddev_suspend and flush bio
  md: change the return value type of md_write_start to void
  md: do not delete safemode_timer in mddev_suspend
parents 83a7eefe 305a5170

drivers/md/dm-raid.c

+1 −1
Original line number Diff line number Diff line
@@ -3542,7 +3542,7 @@ static void raid_status(struct dm_target *ti, status_type_t type, 
		recovery = rs->md.recovery;

		state = decipher_sync_action(mddev, recovery);

		progress = rs_get_progress(rs, recovery, state, resync_max_sectors);

		resync_mismatches = (mddev->last_sync_action && !strcasecmp(mddev->last_sync_action, "check")) ?

		resync_mismatches = mddev->last_sync_action == ACTION_CHECK ?

				    atomic64_read(&mddev->resync_mismatches) : 0;



		/* HM FIXME: do we want another state char for raid0? It shows 'D'/'A'/'-' now */

drivers/md/md-bitmap.c

+3 −3
Original line number Diff line number Diff line
@@ -227,6 +227,8 @@ static int __write_sb_page(struct md_rdev *rdev, struct bitmap *bitmap, 
	struct block_device *bdev;

	struct mddev *mddev = bitmap->mddev;

	struct bitmap_storage *store = &bitmap->storage;

	unsigned int bitmap_limit = (bitmap->storage.file_pages - pg_index) <<

		PAGE_SHIFT;

	loff_t sboff, offset = mddev->bitmap_info.offset;

	sector_t ps = pg_index * PAGE_SIZE / SECTOR_SIZE;

	unsigned int size = PAGE_SIZE;
@@ -269,11 +271,9 @@ static int __write_sb_page(struct md_rdev *rdev, struct bitmap *bitmap, 
		if (size == 0)

			/* bitmap runs in to data */

			return -EINVAL;

	} else {

		/* DATA METADATA BITMAP - no problems */

	}



	md_super_write(mddev, rdev, sboff + ps, (int) size, page);

	md_super_write(mddev, rdev, sboff + ps, (int)min(size, bitmap_limit), page);

	return 0;

}

drivers/md/md.c

+299 −207

File changed.

Preview size limit exceeded, changes collapsed.

drivers/md/md.h

+103 −23

File changed.

Preview size limit exceeded, changes collapsed.

drivers/md/raid0.c

+5 −16
Original line number Diff line number Diff line
@@ -365,18 +365,13 @@ static sector_t raid0_size(struct mddev *mddev, sector_t sectors, int raid_disks 
	return array_sectors;

}



static void free_conf(struct mddev *mddev, struct r0conf *conf)

{

	kfree(conf->strip_zone);

	kfree(conf->devlist);

	kfree(conf);

}



static void raid0_free(struct mddev *mddev, void *priv)

{

	struct r0conf *conf = priv;



	free_conf(mddev, conf);

	kfree(conf->strip_zone);

	kfree(conf->devlist);

	kfree(conf);

}



static int raid0_set_limits(struct mddev *mddev)
@@ -415,7 +410,7 @@ static int raid0_run(struct mddev *mddev) 
	if (!mddev_is_dm(mddev)) {

		ret = raid0_set_limits(mddev);

		if (ret)

			goto out_free_conf;

			return ret;

	}



	/* calculate array device size */
@@ -427,13 +422,7 @@ static int raid0_run(struct mddev *mddev) 


	dump_zones(mddev);



	ret = md_integrity_register(mddev);

	if (ret)

		goto out_free_conf;

	return 0;

out_free_conf:

	free_conf(mddev, conf);

	return ret;

	return md_integrity_register(mddev);

}



/*