Commit d57125b5 authored by Ilya Dryomov's avatar Ilya Dryomov
Browse files

Revert "ceph: make members in struct ceph_mds_request_args_ext a union" 



This reverts commit 3af5ae22.

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: default avatarIlya Dryomov <idryomov@gmail.com>
Reviewed-by: default avatarXiubo Li <xiubli@redhat.com>
parent 2816a096

include/linux/ceph/ceph_fs.h

+11 −13
Original line number Original line Diff line number Diff line
@@ -467,7 +467,6 @@ union ceph_mds_request_args { 
} __attribute__ ((packed));

} __attribute__ ((packed));





union ceph_mds_request_args_ext {

union ceph_mds_request_args_ext {

	union {

	union ceph_mds_request_args old;

	union ceph_mds_request_args old;

	struct {

	struct {

		__le32 mode;

		__le32 mode;
@@ -480,7 +479,6 @@ union ceph_mds_request_args_ext { 
		struct ceph_timespec btime;

		struct ceph_timespec btime;

	} __attribute__ ((packed)) setattr_ext;

	} __attribute__ ((packed)) setattr_ext;

};

};

};





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

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

#define CEPH_MDS_FLAG_WANT_DENTRY	2 /* want dentry in reply */

#define CEPH_MDS_FLAG_WANT_DENTRY	2 /* want dentry in reply */