* [PATCH] btrfs: use assign_bit() where applicable
@ 2026-09-20 2:27 Peng Fan (OSS)
2026-09-21 12:55 ` David Sterba
0 siblings, 1 reply; 2+ messages in thread
From: Peng Fan (OSS) @ 2026-09-20 2:27 UTC (permalink / raw)
To: David Sterba, Chris Mason; +Cc: linux-kernel, Peng Fan, linux-btrfs
From: Peng Fan <peng.fan@nxp.com>
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 <peng.fan@nxp.com>
---
fs/btrfs/qgroup.c | 6 ++----
fs/btrfs/sysfs.c | 5 +----
fs/btrfs/volumes.c | 6 ++----
3 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c
index 05e35eb126dc..bf06962d49f3 100644
--- a/fs/btrfs/qgroup.c
+++ b/fs/btrfs/qgroup.c
@@ -3177,10 +3177,8 @@ int btrfs_run_qgroups(struct btrfs_trans_handle *trans)
"qgroup limit item update error %d", ret);
spin_lock(&fs_info->qgroup_lock);
}
- if (btrfs_qgroup_enabled(fs_info))
- set_bit(BTRFS_QGROUP_STATUS_BIT_ON, &fs_info->qgroup_flags);
- else
- clear_bit(BTRFS_QGROUP_STATUS_BIT_ON, &fs_info->qgroup_flags);
+ assign_bit(BTRFS_QGROUP_STATUS_BIT_ON, &fs_info->qgroup_flags,
+ btrfs_qgroup_enabled(fs_info));
spin_unlock(&fs_info->qgroup_lock);
ret = update_qgroup_status_item(trans);
diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c
index c5bb1c7eac6a..3ac1fa608d3b 100644
--- a/fs/btrfs/sysfs.c
+++ b/fs/btrfs/sysfs.c
@@ -1117,10 +1117,7 @@ static ssize_t quota_override_store(struct kobject *kobj,
if (knob > 1)
return -EINVAL;
- if (knob)
- set_bit(BTRFS_FS_QUOTA_OVERRIDE, &fs_info->flags);
- else
- clear_bit(BTRFS_FS_QUOTA_OVERRIDE, &fs_info->flags);
+ assign_bit(BTRFS_FS_QUOTA_OVERRIDE, &fs_info->flags, knob);
return len;
}
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 4ddabadc9188..31d790fea8d8 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -698,10 +698,8 @@ static int btrfs_open_one_device(struct btrfs_fs_devices *fs_devices,
clear_bit(BTRFS_DEV_STATE_WRITEABLE, &device->dev_state);
fs_devices->seeding = true;
} else {
- if (bdev_read_only(file_bdev(bdev_file)))
- clear_bit(BTRFS_DEV_STATE_WRITEABLE, &device->dev_state);
- else
- set_bit(BTRFS_DEV_STATE_WRITEABLE, &device->dev_state);
+ assign_bit(BTRFS_DEV_STATE_WRITEABLE, &device->dev_state,
+ !bdev_read_only(file_bdev(bdev_file)));
}
if (bdev_rot(file_bdev(bdev_file)))
--
2.51.0
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] btrfs: use assign_bit() where applicable
2026-09-20 2:27 [PATCH] btrfs: use assign_bit() where applicable Peng Fan (OSS)
@ 2026-09-21 12:55 ` David Sterba
0 siblings, 0 replies; 2+ messages in thread
From: David Sterba @ 2026-09-21 12:55 UTC (permalink / raw)
To: Peng Fan (OSS)
Cc: David Sterba, Chris Mason, linux-kernel, Peng Fan, linux-btrfs
On Sun, Sep 20, 2026 at 10:27:29AM +0800, Peng Fan (OSS) wrote:
> From: Peng Fan <peng.fan@nxp.com>
>
> 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 <peng.fan@nxp.com>
Added to for-next, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-09-21 12:55 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-09-20 2:27 [PATCH] btrfs: use assign_bit() where applicable Peng Fan (OSS)
2026-09-21 12:55 ` David Sterba
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox