diff options
| author | Ilya Dryomov <idryomov@gmail.com> | 2023-09-18 11:44:08 +0300 |
|---|---|---|
| committer | Ilya Dryomov <idryomov@gmail.com> | 2023-09-18 13:04:50 +0300 |
| commit | d57125b55a292a8e74a1fb17182576a3b2b2e795 (patch) | |
| tree | 227c7b4b5aa5bcfa94f0a6c1c6c9f53fe24f47d8 /include | |
| parent | 2816a09678f50fc6a69e742e90cb1fd7a9f1f9ff (diff) | |
| download | linux-d57125b55a292a8e74a1fb17182576a3b2b2e795.tar.xz | |
Revert "ceph: make members in struct ceph_mds_request_args_ext a union"
This reverts commit 3af5ae22030cb59fab4fba35f5a2b62f47e14df9.
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>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/ceph/ceph_fs.h | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/include/linux/ceph/ceph_fs.h b/include/linux/ceph/ceph_fs.h index 5f2301ee88bc..f3b3593254b9 100644 --- a/include/linux/ceph/ceph_fs.h +++ b/include/linux/ceph/ceph_fs.h @@ -467,19 +467,17 @@ union ceph_mds_request_args { } __attribute__ ((packed)); union ceph_mds_request_args_ext { - union { - union ceph_mds_request_args old; - struct { - __le32 mode; - __le32 uid; - __le32 gid; - struct ceph_timespec mtime; - struct ceph_timespec atime; - __le64 size, old_size; /* old_size needed by truncate */ - __le32 mask; /* CEPH_SETATTR_* */ - struct ceph_timespec btime; - } __attribute__ ((packed)) setattr_ext; - }; + union ceph_mds_request_args old; + struct { + __le32 mode; + __le32 uid; + __le32 gid; + struct ceph_timespec mtime; + struct ceph_timespec atime; + __le64 size, old_size; /* old_size needed by truncate */ + __le32 mask; /* CEPH_SETATTR_* */ + struct ceph_timespec btime; + } __attribute__ ((packed)) setattr_ext; }; #define CEPH_MDS_FLAG_REPLAY 1 /* this is a replayed op */ |