From: "Peng Fan (OSS)" <peng.fan@oss.nxp.com>
To: David Sterba <dsterba@suse.com>, Chris Mason <mason@kernel.org>
Cc: linux-kernel@vger.kernel.org, Peng Fan <peng.fan@nxp.com>,
linux-btrfs@vger.kernel.org
Subject: [PATCH] btrfs: use assign_bit() where applicable
Date: Sun, 20 Sep 2026 10:27:29 +0800 [thread overview]
Message-ID: <20260920022730.3145797-1-peng.fan@oss.nxp.com> (raw)
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
next reply other threads:[~2026-09-20 2:30 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-20 2:27 Peng Fan (OSS) [this message]
2026-09-21 12:55 ` [PATCH] btrfs: use assign_bit() where applicable David Sterba
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260920022730.3145797-1-peng.fan@oss.nxp.com \
--to=peng.fan@oss.nxp.com \
--cc=dsterba@suse.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mason@kernel.org \
--cc=peng.fan@nxp.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox