-Wflex-array-member-not-at-end was introduced in GCC-14, and we are
getting ready to enable it, globally.

Move the conflicting declaration to the end of the corresponding
structure. Notice that `struct fs_path` is a flexible structure,
this is a structure that contains a flexible-array member (`char
inline_buf[];` in this case).

Fix the following warning:

fs/btrfs/send.c:181:24: warning: structure containing a flexible array member 
is not at the end of another structure [-Wflex-array-member-not-at-end]

Signed-off-by: Gustavo A. R. Silva <[email protected]>
---
 fs/btrfs/send.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c
index 9230e5066fc6..2b7cf49a35bb 100644
--- a/fs/btrfs/send.c
+++ b/fs/btrfs/send.c
@@ -178,7 +178,6 @@ struct send_ctx {
        u64 cur_inode_rdev;
        u64 cur_inode_last_extent;
        u64 cur_inode_next_write_offset;
-       struct fs_path cur_inode_path;
        bool cur_inode_new;
        bool cur_inode_new_gen;
        bool cur_inode_deleted;
@@ -305,6 +304,9 @@ struct send_ctx {
 
        struct btrfs_lru_cache dir_created_cache;
        struct btrfs_lru_cache dir_utimes_cache;
+
+       /* Must be last --ends in a flexible-array member. */
+       struct fs_path cur_inode_path;
 };
 
 struct pending_dir_move {
-- 
2.43.0


Reply via email to