fuse: flatten 'struct fuse_args'

...to make future expansion simpler.  The hiearachical structure is a
historical thing that does not serve any practical purpose.

The generated code is excatly the same before and after the patch.

Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>

1 files changed, 7 insertions, 14 deletions

diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h
index 89bdc41e0d86..835c0671320c 100644
--- a/fs/fuse/fuse_i.h
+++ b/fs/fuse/fuse_i.h
@@ -287,20 +287,13 @@ struct fuse_page_desc {
 };
 
 struct fuse_args {
-	struct {
-		struct {
-			uint32_t opcode;
-			uint64_t nodeid;
-		} h;
-		unsigned numargs;
-		struct fuse_in_arg args[3];
-
-	} in;
-	struct {
-		unsigned argvar:1;
-		unsigned numargs;
-		struct fuse_arg args[2];
-	} out;
+	uint32_t opcode;
+	uint64_t nodeid;
+	unsigned int in_numargs;
+	struct fuse_in_arg in_args[3];
+	unsigned int out_argvar:1;
+	unsigned int out_numargs;
+	struct fuse_arg out_args[2];
 };
 
 #define FUSE_ARGS(args) struct fuse_args args = {}