From: Gustavo A. R. Silva <gustavoars@kernel.org>
Date: Thu, 27 Mar 2025 00:17:44 +0000 (-0600)
Subject: fs: namespace: Avoid -Wflex-array-member-not-at-end warning
X-Git-Tag: v6.15-rc1~53^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9e6901f17a719650be376f04d742bdbe1d7094ce;p=thirdparty%2Fkernel%2Flinux.git

fs: namespace: Avoid -Wflex-array-member-not-at-end warning

-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 structure. Notice
that `struct statmount` is a flexible structure --a structure that
contains a flexible-array member.

Fix the following warning:

fs/namespace.c:5329:26: 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" <gustavoars@kernel.org>
Link: https://lore.kernel.org/r/Z-SZKNdCiAkVJvqm@kspp
Signed-off-by: Christian Brauner <brauner@kernel.org>
---

diff --git a/fs/namespace.c b/fs/namespace.c
index 6100e5b962a6c..16292ff760c93 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -5326,8 +5326,10 @@ struct kstatmount {
 	struct mnt_idmap *idmap;
 	u64 mask;
 	struct path root;
-	struct statmount sm;
 	struct seq_file seq;
+
+	/* Must be last --ends in a flexible-array member. */
+	struct statmount sm;
 };
 
 static u64 mnt_to_attr_flags(struct vfsmount *mnt)