From: Jens Axboe <axboe@kernel.dk>
Date: Thu, 13 Mar 2025 11:34:51 +0000 (-0600)
Subject: Merge tag 'md-6.15-20250312' of https://git.kernel.org/pub/scm/linux/kernel/git/mdrai... 
X-Git-Tag: v6.15-rc1~166^2~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=017ff379b60b98c17b82f878b4eb751dc99eb21c;p=thirdparty%2Flinux.git

Merge tag 'md-6.15-20250312' of https://git.kernel.org/pub/scm/linux/kernel/git/mdraid/linux into for-6.15/block

Merge MD changes from Yu:

"- fix recovery can preempt resync (Li Nan)
 - fix md-bitmap IO limit (Su Yue)
 - fix raid10 discard with REQ_NOWAIT (Xiao Ni)
 - fix raid1 memory leak (Zheng Qixing)
 - fix mddev uaf (Yu Kuai)
 - fix raid1,raid10 IO flags (Yu Kuai)
 - some refactor and cleanup (Yu Kuai)"

* tag 'md-6.15-20250312' of https://git.kernel.org/pub/scm/linux/kernel/git/mdraid/linux:
  md/raid10: wait barrier before returning discard request with REQ_NOWAIT
  md/md-bitmap: fix wrong bitmap_limit for clustermd when write sb
  md/raid1,raid10: don't ignore IO flags
  md/raid5: merge reshape_progress checking inside get_reshape_loc()
  md: fix mddev uaf while iterating all_mddevs list
  md: switch md-cluster to use md_submodle_head
  md: don't export md_cluster_ops
  md/md-cluster: cleanup md_cluster_ops reference
  md: switch personalities to use md_submodule_head
  md: introduce struct md_submodule_head and APIs
  md: only include md-cluster.h if necessary
  md: merge common code into find_pers()
  md/raid1: fix memory leak in raid1_run() if no active rdev
  md: ensure resync is prioritized over recovery
---

017ff379b60b98c17b82f878b4eb751dc99eb21c
diff --cc drivers/md/md.h
index 6edc0f71b7d4b,dd6a28f5d8e62..1cf00a04bcdd7
--- a/drivers/md/md.h
+++ b/drivers/md/md.h
@@@ -289,11 -315,12 +315,12 @@@ static inline int rdev_has_badblock(str
  	return is_badblock(rdev, s, sectors, &first_bad, &bad_sectors);
  }
  
 -extern int rdev_set_badblocks(struct md_rdev *rdev, sector_t s, int sectors,
 -			      int is_new);
 -extern int rdev_clear_badblocks(struct md_rdev *rdev, sector_t s, int sectors,
 -				int is_new);
 +extern bool rdev_set_badblocks(struct md_rdev *rdev, sector_t s, int sectors,
 +			       int is_new);
 +extern void rdev_clear_badblocks(struct md_rdev *rdev, sector_t s, int sectors,
 +				 int is_new);
  struct md_cluster_info;
+ struct md_cluster_operations;
  
  /**
   * enum mddev_flags - md device flags.