[PATCH] bcachefs: Use FOREACH_ACL_ENTRY() macro to iterate over acl entries

Thorsten Blum posted 1 patch 2 months ago
fs/bcachefs/acl.c | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
[PATCH] bcachefs: Use FOREACH_ACL_ENTRY() macro to iterate over acl entries
Posted by Thorsten Blum 2 months ago
Use the existing FOREACH_ACL_ENTRY() macro to iterate over POSIX acl
entries and remove the custom acl_for_each_entry() macro.

Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
---
 fs/bcachefs/acl.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/fs/bcachefs/acl.c b/fs/bcachefs/acl.c
index 1def61875a6f..56b160e71a53 100644
--- a/fs/bcachefs/acl.c
+++ b/fs/bcachefs/acl.c
@@ -184,11 +184,6 @@ static struct posix_acl *bch2_acl_from_disk(struct btree_trans *trans,
 	return ERR_PTR(-EINVAL);
 }
 
-#define acl_for_each_entry(acl, acl_e)			\
-	for (acl_e = acl->a_entries;			\
-	     acl_e < acl->a_entries + acl->a_count;	\
-	     acl_e++)
-
 /*
  * Convert from in-memory to filesystem representation.
  */
@@ -199,11 +194,11 @@ bch2_acl_to_xattr(struct btree_trans *trans,
 {
 	struct bkey_i_xattr *xattr;
 	bch_acl_header *acl_header;
-	const struct posix_acl_entry *acl_e;
+	const struct posix_acl_entry *acl_e, *pe;
 	void *outptr;
 	unsigned nr_short = 0, nr_long = 0, acl_len, u64s;
 
-	acl_for_each_entry(acl, acl_e) {
+	FOREACH_ACL_ENTRY(acl_e, acl, pe) {
 		switch (acl_e->e_tag) {
 		case ACL_USER:
 		case ACL_GROUP:
@@ -241,7 +236,7 @@ bch2_acl_to_xattr(struct btree_trans *trans,
 
 	outptr = (void *) acl_header + sizeof(*acl_header);
 
-	acl_for_each_entry(acl, acl_e) {
+	FOREACH_ACL_ENTRY(acl_e, acl, pe) {
 		bch_acl_entry *entry = outptr;
 
 		entry->e_tag = cpu_to_le16(acl_e->e_tag);
-- 
2.46.1
Re: [PATCH] bcachefs: Use FOREACH_ACL_ENTRY() macro to iterate over acl entries
Posted by Kent Overstreet 2 months ago
On Mon, Sep 23, 2024 at 04:44:53PM GMT, Thorsten Blum wrote:
> Use the existing FOREACH_ACL_ENTRY() macro to iterate over POSIX acl
> entries and remove the custom acl_for_each_entry() macro.
> 
> Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>

Applied