Skip to content

Commit d57125b

Browse files
committed
Revert "ceph: make members in struct ceph_mds_request_args_ext a union"
This reverts commit 3af5ae2. ceph_mds_request_args_ext was already (and remains to be) a union. An additional anonymous union inside is bogus: union ceph_mds_request_args_ext { union { union ceph_mds_request_args old; struct { ... } __attribute__ ((packed)) setattr_ext; }; } Signed-off-by: Ilya Dryomov <idryomov@gmail.com> Reviewed-by: Xiubo Li <xiubli@redhat.com>
1 parent 2816a09 commit d57125b

File tree

1 file changed

+11
-13
lines changed

1 file changed

+11
-13
lines changed

include/linux/ceph/ceph_fs.h

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -467,19 +467,17 @@ union ceph_mds_request_args {
467467
} __attribute__ ((packed));
468468

469469
union ceph_mds_request_args_ext {
470-
union {
471-
union ceph_mds_request_args old;
472-
struct {
473-
__le32 mode;
474-
__le32 uid;
475-
__le32 gid;
476-
struct ceph_timespec mtime;
477-
struct ceph_timespec atime;
478-
__le64 size, old_size; /* old_size needed by truncate */
479-
__le32 mask; /* CEPH_SETATTR_* */
480-
struct ceph_timespec btime;
481-
} __attribute__ ((packed)) setattr_ext;
482-
};
470+
union ceph_mds_request_args old;
471+
struct {
472+
__le32 mode;
473+
__le32 uid;
474+
__le32 gid;
475+
struct ceph_timespec mtime;
476+
struct ceph_timespec atime;
477+
__le64 size, old_size; /* old_size needed by truncate */
478+
__le32 mask; /* CEPH_SETATTR_* */
479+
struct ceph_timespec btime;
480+
} __attribute__ ((packed)) setattr_ext;
483481
};
484482

485483
#define CEPH_MDS_FLAG_REPLAY 1 /* this is a replayed op */

0 commit comments

Comments
 (0)