61 lines
1.9 KiB
Diff
61 lines
1.9 KiB
Diff
From e4753128a6cfda251b1dcb95320735c0a2e036c8 Mon Sep 17 00:00:00 2001
|
|
From: Thorsten Blum <thorsten.blum@linux.dev>
|
|
Date: Mon, 23 Sep 2024 16:44:53 +0200
|
|
Subject: [PATCH 016/233] bcachefs: Use FOREACH_ACL_ENTRY() macro to iterate
|
|
over acl entries
|
|
Content-Type: text/plain; charset="utf-8"
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
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>
|
|
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
|
|
Signed-off-by: Alexander Miroshnichenko <alex@millerson.name>
|
|
---
|
|
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 87f1be9d4db4..99487727ae64 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.45.2
|
|
|