From: Eric Sandeen <sandeen@redhat.com>
To: "Darrick J. Wong" <darrick.wong@oracle.com>,
"Theodore Ts'o" <tytso@mit.edu>
Cc: ext4 development <linux-ext4@vger.kernel.org>
Subject: Re: [PATCH] libext2fs: fix endian checking bits
Date: Tue, 04 Nov 2014 17:35:15 -0600 [thread overview]
Message-ID: <545962B3.80003@redhat.com> (raw)
In-Reply-To: <20141104232911.GC10043@birch.djwong.org>
On 11/4/14 5:29 PM, Darrick J. Wong wrote:
> Commit 3e683eef936e6d ("define bitwise types and annotate conversion
> routines") broke the build on various platforms. Turns out that
> crossing our fingers wasn't such a good idea, so just define it
> separately.
sooorrry!
Seems fine, thanks.
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> ---
> lib/blkid/blkid_types.h.in | 15 ---------------
> lib/ext2fs/ext2_types.h.in | 8 +++++++-
> 2 files changed, 7 insertions(+), 16 deletions(-)
>
> diff --git a/lib/blkid/blkid_types.h.in b/lib/blkid/blkid_types.h.in
> index 2bb3d85..d4c81d0 100644
> --- a/lib/blkid/blkid_types.h.in
> +++ b/lib/blkid/blkid_types.h.in
> @@ -164,19 +164,4 @@ typedef long __s64;
> #undef __S64_TYPEDEF
> #undef __U64_TYPEDEF
>
> -#ifdef __CHECKER__
> -#define __bitwise __attribute__((bitwise))
> -#define __force __attribute__((force))
> -#else
> -#define __bitwise
> -#define __force
> -#endif
> -
> -typedef __u16 __bitwise __le16;
> -typedef __u32 __bitwise __le32;
> -typedef __u64 __bitwise __le64;
> -typedef __u16 __bitwise __be16;
> -typedef __u32 __bitwise __be32;
> -typedef __u64 __bitwise __be64;
> -
> #endif /* _*_TYPES_H */
> diff --git a/lib/ext2fs/ext2_types.h.in b/lib/ext2fs/ext2_types.h.in
> index a00ed7f..fd57231 100644
> --- a/lib/ext2fs/ext2_types.h.in
> +++ b/lib/ext2fs/ext2_types.h.in
> @@ -164,6 +164,12 @@ typedef long __s64;
> #undef __S64_TYPEDEF
> #undef __U64_TYPEDEF
>
> +#endif /* _*_TYPES_H */
> +
> +/* endian checking stuff */
> +#ifndef EXT2_ENDIAN_H_
> +#define EXT2_ENDIAN_H_
> +
> #ifdef __CHECKER__
> #define __bitwise __attribute__((bitwise))
> #define __force __attribute__((force))
> @@ -179,6 +185,6 @@ typedef __u16 __bitwise __be16;
> typedef __u32 __bitwise __be32;
> typedef __u64 __bitwise __be64;
>
> -#endif /* _*_TYPES_H */
> +#endif /* EXT2_ENDIAN_H_ */
>
> @PUBLIC_CONFIG_HEADER@
>
next prev parent reply other threads:[~2014-11-04 23:35 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-04 23:29 [PATCH] libext2fs: fix endian checking bits Darrick J. Wong
2014-11-04 23:35 ` Eric Sandeen [this message]
2014-11-05 16:09 ` Theodore Ts'o
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=545962B3.80003@redhat.com \
--to=sandeen@redhat.com \
--cc=darrick.wong@oracle.com \
--cc=linux-ext4@vger.kernel.org \
--cc=tytso@mit.edu \
/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 NNTP newsgroup(s).