CEPH-Devel archive mirror
 help / color / mirror / Atom feed
From: Xiubo Li <xiubli@redhat.com>
To: Ilya Dryomov <idryomov@gmail.com>, ceph-devel@vger.kernel.org
Cc: Milind Changire <mchangir@redhat.com>
Subject: Re: [PATCH] Revert "ceph: make members in struct ceph_mds_request_args_ext a union"
Date: Mon, 18 Sep 2023 17:29:14 +0800	[thread overview]
Message-ID: <bbc7d840-ae5a-8520-10b9-5b717813dd2a@redhat.com> (raw)
In-Reply-To: <20230918085509.55682-1-idryomov@gmail.com>


On 9/18/23 16:55, Ilya Dryomov wrote:
> 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>
> ---
>   include/linux/ceph/ceph_fs.h | 24 +++++++++++-------------
>   1 file 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 */

Reviewed-by: Xiubo Li <xiubli@redhat.com>

Thanks

- Xiubo


      reply	other threads:[~2023-09-18  9:30 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-09-18  8:55 [PATCH] Revert "ceph: make members in struct ceph_mds_request_args_ext a union" Ilya Dryomov
2023-09-18  9:29 ` Xiubo Li [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=bbc7d840-ae5a-8520-10b9-5b717813dd2a@redhat.com \
    --to=xiubli@redhat.com \
    --cc=ceph-devel@vger.kernel.org \
    --cc=idryomov@gmail.com \
    --cc=mchangir@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).