Hi,
在 2026/9/18 22:17, Peng Fan (OSS) 写道:
> From: Peng Fan <[email protected]>
>
> Convert open-coded if/else with set_bit/clear_bit and their
> non-atomic __set_bit/__clear_bit variants to the assign_bit/__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);
>
> // __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 <[email protected]>
> ---
> drivers/md/dm-mpath.c | 5 +----
> drivers/md/dm-zone.c | 6 ++----
> drivers/md/md.c | 22 ++++++----------------
> drivers/md/persistent-data/dm-bitset.c | 5 +----
> drivers/md/raid5-cache.c | 6 ++----
> drivers/md/raid5.c | 6 ++----
> 6 files changed, 14 insertions(+), 36 deletions(-)
please split this patch, one for mdraid and one for device mapper, they are
different subsystem.
>
> diff --git a/drivers/md/dm-mpath.c b/drivers/md/dm-mpath.c
> index 7cb7bb6233b6..ae9318f5f21b 100644
> --- a/drivers/md/dm-mpath.c
> +++ b/drivers/md/dm-mpath.c
> @@ -1604,10 +1604,7 @@ static void pg_init_done(void *data, int errors)
> goto out;
>
> if (test_bit(MPATHF_PG_INIT_REQUIRED, &m->flags)) {
> - if (delay_retry)
> - set_bit(MPATHF_PG_INIT_DELAY_RETRY, &m->flags);
> - else
> - clear_bit(MPATHF_PG_INIT_DELAY_RETRY, &m->flags);
> + assign_bit(MPATHF_PG_INIT_DELAY_RETRY, &m->flags, delay_retry);
>
> if (__pg_init_all_paths(m))
> goto out;
> diff --git a/drivers/md/dm-zone.c b/drivers/md/dm-zone.c
> index f29acf64429a..35916c6e490e 100644
> --- a/drivers/md/dm-zone.c
> +++ b/drivers/md/dm-zone.c
> @@ -447,10 +447,8 @@ void dm_finalize_zone_settings(struct dm_table *t,
> struct queue_limits *lim)
> struct mapped_device *md = t->md;
>
> if (lim->features & BLK_FEAT_ZONED) {
> - if (dm_table_supports_zone_append(t))
> - clear_bit(DMF_EMULATE_ZONE_APPEND, &md->flags);
> - else
> - set_bit(DMF_EMULATE_ZONE_APPEND, &md->flags);
> + assign_bit(DMF_EMULATE_ZONE_APPEND, &md->flags,
> + !dm_table_supports_zone_append(t));
> } else {
> clear_bit(DMF_EMULATE_ZONE_APPEND, &md->flags);
> md->disk->nr_zones = 0;
> 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/persistent-data/dm-bitset.c
> b/drivers/md/persistent-data/dm-bitset.c
> index 00c0a3f186b7..6680f05c25ec 100644
> --- a/drivers/md/persistent-data/dm-bitset.c
> +++ b/drivers/md/persistent-data/dm-bitset.c
> @@ -59,10 +59,7 @@ static int pack_bits(uint32_t index, void *value, void
> *context)
> if (r)
> return r;
>
> - if (bv)
> - set_bit(bit, (unsigned long *) &word);
> - else
> - clear_bit(bit, (unsigned long *) &word);
> + assign_bit(bit, (unsigned long *)&word, bv);
> }
>
> *((__le64 *) value) = cpu_to_le64(word);
> 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);
> }
--
Thanks,
Kuai
