56 lines
1.8 KiB
Diff
56 lines
1.8 KiB
Diff
From c4bfe7049c62651c7e03210760529e2fab9a7706 Mon Sep 17 00:00:00 2001
|
|
From: Kent Overstreet <kent.overstreet@linux.dev>
|
|
Date: Sat, 12 Oct 2024 14:07:44 -0400
|
|
Subject: [PATCH 029/233] bcachefs: Fix warning about passing flex array member
|
|
by value
|
|
Content-Type: text/plain; charset="utf-8"
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
this showed up when building in userspace
|
|
|
|
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
|
|
Signed-off-by: Alexander Miroshnichenko <alex@millerson.name>
|
|
---
|
|
fs/bcachefs/disk_accounting.c | 10 +++++-----
|
|
1 file changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/fs/bcachefs/disk_accounting.c b/fs/bcachefs/disk_accounting.c
|
|
index 38b563113cfb..55a00018dc8b 100644
|
|
--- a/fs/bcachefs/disk_accounting.c
|
|
+++ b/fs/bcachefs/disk_accounting.c
|
|
@@ -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 &&
|
|
--
|
|
2.45.2
|
|
|