[Patch V2] md/raid: use assign_bit() where applicable

From: Peng Fan (OSS)

Date: Mon Sep 21 2026 - 04:17:10 EST


From: Peng Fan <peng.fan@xxxxxxx>

Convert open-coded if/else with set_bit/clear_bit to the assign_bit API.

Done with Coccinelle semantic patch:
// set_bit -> clear_bit => assign_bit

@@
expression cond, bit, addr;
@@

-if (cond)
- set_bit(bit, addr);
-else
- clear_bit(bit, addr);
+assign_bit(bit, addr, cond);

// clear_bit -> set_bit => assign_bit

@@
expression cond, bit, addr;
@@

-if (cond)
- clear_bit(bit, addr);
-else
- set_bit(bit, addr);
+assign_bit(bit, addr, !cond);

Signed-off-by: Peng Fan <peng.fan@xxxxxxx>
---

V2:
Separate device-mapper and mraid
https://lore.kernel.org/all/20260918141737.3023011-1-peng.fan@xxxxxxxxxxx/

drivers/md/md.c | 22 ++++++----------------
drivers/md/raid5-cache.c | 6 ++----
drivers/md/raid5.c | 6 ++----
3 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/drivers/md/md.c b/drivers/md/md.c
index 680b34a63cb3..6b2a397f8a9c 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -3586,10 +3586,7 @@ static ssize_t recovery_start_store(struct md_rdev *rdev, const char *buf, size_
return -EBUSY;

rdev->recovery_offset = recovery_start;
- if (recovery_start == MaxSector)
- set_bit(In_sync, &rdev->flags);
- else
- clear_bit(In_sync, &rdev->flags);
+ assign_bit(In_sync, &rdev->flags, recovery_start == MaxSector);
return len;
}

@@ -5915,10 +5912,7 @@ fail_last_dev_store(struct mddev *mddev, const char *buf, size_t len)
if (ret)
return ret;

- if (value)
- set_bit(MD_FAILLAST_DEV, &mddev->flags);
- else
- clear_bit(MD_FAILLAST_DEV, &mddev->flags);
+ assign_bit(MD_FAILLAST_DEV, &mddev->flags, value);

return len;
}
@@ -7574,14 +7568,10 @@ int md_add_new_disk(struct mddev *mddev, struct mdu_disk_info_s *info)
}

clear_bit(In_sync, &rdev->flags); /* just to be sure */
- if (info->state & (1<<MD_DISK_WRITEMOSTLY))
- set_bit(WriteMostly, &rdev->flags);
- else
- clear_bit(WriteMostly, &rdev->flags);
- if (info->state & (1<<MD_DISK_FAILFAST))
- set_bit(FailFast, &rdev->flags);
- else
- clear_bit(FailFast, &rdev->flags);
+ assign_bit(WriteMostly, &rdev->flags,
+ info->state & (1 << MD_DISK_WRITEMOSTLY));
+ assign_bit(FailFast, &rdev->flags,
+ info->state & (1 << MD_DISK_FAILFAST));

if (info->state & (1<<MD_DISK_JOURNAL)) {
struct md_rdev *rdev2;
diff --git a/drivers/md/raid5-cache.c b/drivers/md/raid5-cache.c
index 7b7546bfa21f..b442a4de61fb 100644
--- a/drivers/md/raid5-cache.c
+++ b/drivers/md/raid5-cache.c
@@ -432,10 +432,8 @@ static inline void r5c_update_log_state(struct r5l_log *log)
wake_reclaim = true;
clear_bit(R5C_LOG_CRITICAL, &conf->cache_state);
}
- if (free_space < 3 * reclaim_space)
- set_bit(R5C_LOG_TIGHT, &conf->cache_state);
- else
- clear_bit(R5C_LOG_TIGHT, &conf->cache_state);
+ assign_bit(R5C_LOG_TIGHT, &conf->cache_state,
+ free_space < 3 * reclaim_space);

if (wake_reclaim)
r5l_wake_reclaim(log, 0);
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index b91545ce090d..713596ee933c 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -4748,10 +4748,8 @@ static void analyse_stripe(struct stripe_head *sh, struct stripe_head_state *s)
RAID5_STRIPE_SECTORS(conf)))
set_bit(R5_ReadRepl, &dev->flags);
else {
- if (rdev && !test_bit(Faulty, &rdev->flags))
- set_bit(R5_NeedReplace, &dev->flags);
- else
- clear_bit(R5_NeedReplace, &dev->flags);
+ assign_bit(R5_NeedReplace, &dev->flags,
+ rdev && !test_bit(Faulty, &rdev->flags));
rdev = conf->disks[i].rdev;
clear_bit(R5_ReadRepl, &dev->flags);
}
--
2.51.0