From: Dave Chinner <david@fromorbit.com>
To: Jan Tulak <jtulak@redhat.com>
Cc: xfs@oss.sgi.com
Subject: Re: [PATCH 1/2] Prefix LIST_... macros to XFS_LIST_...
Date: Thu, 16 Jul 2015 09:53:06 +1000 [thread overview]
Message-ID: <20150715235306.GT3902@dastard> (raw)
In-Reply-To: <1436964412-12093-2-git-send-email-jtulak@redhat.com>
On Wed, Jul 15, 2015 at 02:46:51PM +0200, Jan Tulak wrote:
> OS X has some conflicting LIST_ macros, so prefix the XFS ones.
What are the macros that conflict and where do they come from?
> --- a/include/irix.h
> +++ b/include/irix.h
> @@ -230,7 +230,7 @@ static __inline__ int xfsctl(const char *path, int fd, int cmd, void *arg)
> ((xfs_fsop_handlereq_t*)arg)->ihandlen,
> ((xfs_fsop_handlereq_t*)arg)->ohandle,
> ((xfs_fsop_handlereq_t*)arg)->ohandlen);
> - case SGI_ATTR_LIST_BY_HANDLE:
> + case SGI_ATTR_XFS_LIST_BY_HANDLE:
This is wrong - that's an Irix ioctl name and should not be renamed.
It won' compile on Irix with this change...
> diff --git a/libxfs/xfs_fs.h b/libxfs/xfs_fs.h
> index 89689c6..8c37e08 100644
> --- a/libxfs/xfs_fs.h
> +++ b/libxfs/xfs_fs.h
> @@ -403,7 +403,7 @@ typedef struct xfs_fsop_handlereq {
> /*
> * Compound structures for passing args through Handle Request interfaces
> * xfs_fssetdm_by_handle, xfs_attrlist_by_handle, xfs_attrmulti_by_handle
> - * - ioctls: XFS_IOC_FSSETDM_BY_HANDLE, XFS_IOC_ATTRLIST_BY_HANDLE, and
> + * - ioctls: XFS_IOC_FSSETDM_BY_HANDLE, XFS_IOC_ATTRXFS_LIST_BY_HANDLE, and
> * XFS_IOC_ATTRMULTI_BY_HANDLE
> */
>
> @@ -553,7 +553,7 @@ typedef struct xfs_swapext
> #endif
>
> #define XFS_IOC_FSSETDM_BY_HANDLE _IOW ('X', 121, struct xfs_fsop_setdm_handlereq)
> -#define XFS_IOC_ATTRLIST_BY_HANDLE _IOW ('X', 122, struct xfs_fsop_attrlist_handlereq)
> +#define XFS_IOC_ATTRXFS_LIST_BY_HANDLE _IOW ('X', 122, struct xfs_fsop_attrlist_handlereq)
> #define XFS_IOC_ATTRMULTI_BY_HANDLE _IOW ('X', 123, struct xfs_fsop_attrmulti_handlereq)
> #define XFS_IOC_FSGEOMETRY _IOR ('X', 124, struct xfs_fsop_geom)
> #define XFS_IOC_GOINGDOWN _IOR ('X', 125, __uint32_t)
Renaming Linux ioctls is wrong, too, as that will break all source
code outside xfsprogs that uses this ioctl.
Cheers,
Dave.
--
Dave Chinner
david@fromorbit.com
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
next prev parent reply other threads:[~2015-07-15 23:53 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-15 12:46 [PATCH 0/2] xfsprogs: Partial OS X support Jan Tulak
2015-07-15 12:46 ` [PATCH 1/2] Prefix LIST_... macros to XFS_LIST_ Jan Tulak
2015-07-15 23:53 ` Dave Chinner [this message]
2015-07-16 7:12 ` Jan Tulak
2015-07-26 16:19 ` Christoph Hellwig
2015-07-15 12:46 ` [PATCH 2/2] OS X partial support Jan Tulak
2015-07-16 1:25 ` Dave Chinner
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=20150715235306.GT3902@dastard \
--to=david@fromorbit.com \
--cc=jtulak@redhat.com \
--cc=xfs@oss.sgi.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