]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
bcachefs: Fix warning about passing flex array member by value
authorKent Overstreet <kent.overstreet@linux.dev>
Sat, 12 Oct 2024 18:07:44 +0000 (14:07 -0400)
committerKent Overstreet <kent.overstreet@linux.dev>
Sat, 21 Dec 2024 06:36:15 +0000 (01:36 -0500)
this showed up when building in userspace

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
fs/bcachefs/disk_accounting.c

index 38b563113cfbf9f91f466ea8b3988722445a2247..55a00018dc8bd5e99c4a766e12add464b9d78c4c 100644 (file)
@@ -244,10 +244,10 @@ void bch2_accounting_swab(struct bkey_s k)
 }
 
 static inline void __accounting_to_replicas(struct bch_replicas_entry_v1 *r,
-                                           struct disk_accounting_pos acc)
+                                           struct disk_accounting_pos *acc)
 {
-       unsafe_memcpy(r, &acc.replicas,
-                     replicas_entry_bytes(&acc.replicas),
+       unsafe_memcpy(r, &acc->replicas,
+                     replicas_entry_bytes(&acc->replicas),
                      "variable length struct");
 }
 
@@ -258,7 +258,7 @@ static inline bool accounting_to_replicas(struct bch_replicas_entry_v1 *r, struc
 
        switch (acc_k.type) {
        case BCH_DISK_ACCOUNTING_replicas:
-               __accounting_to_replicas(r, acc_k);
+               __accounting_to_replicas(r, &acc_k);
                return true;
        default:
                return false;
@@ -626,7 +626,7 @@ static int bch2_disk_accounting_validate_late(struct btree_trans *trans,
        switch (acc.type) {
        case BCH_DISK_ACCOUNTING_replicas: {
                struct bch_replicas_padded r;
-               __accounting_to_replicas(&r.e, acc);
+               __accounting_to_replicas(&r.e, &acc);
 
                for (unsigned i = 0; i < r.e.nr_devs; i++)
                        if (r.e.devs[i] != BCH_SB_MEMBER_INVALID &&