aleph/lkl_linux
1
0
Fork 0
mirror of https://github.com/lkl/linux.git synced 2025-12-19 08:03:01 +09:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 3af5ae2203.

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>
This commit is contained in:
Ilya Dryomov
2023-09-18 10:44:08 +02:00
parent 2816a09678
commit d57125b55a
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
include/linux/ceph/ceph_fs.h
View File

@@ -467,19 +467,17 @@ 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; __le32 uid;
__le32 uid; __le32 gid;
__le32 gid; struct ceph_timespec mtime;
struct ceph_timespec mtime; struct ceph_timespec atime;
struct ceph_timespec atime; __le64 size, old_size; /* old_size needed by truncate */
__le64 size, old_size; /* old_size needed by truncate */ __le32 mask; /* CEPH_SETATTR_* */
__le32 mask; /* CEPH_SETATTR_* */ 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 */