linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Darrick J. Wong" <djwong@us.ibm.com>
To: Andrew Morton <akpm@linux-foundation.org>,
	Herbert Xu <herbert@gondor.apana.org.au>,
	"Darrick J. Wong" <djwong@us.ibm.com>
Cc: Theodore Tso <tytso@mit.edu>,
	Joakim Tjernlund <joakim.tjernlund@transmode.se>,
	Bob Pearson <rpearson@systemfabricworks.com>,
	linux-kernel <linux-kernel@vger.kernel.org>,
	Andreas Dilger <adilger.kernel@dilger.ca>,
	linux-crypto <linux-crypto@vger.kernel.org>,
	linux-fsdevel <linux-fsdevel@vger.kernel.org>,
	Mingming Cao <cmm@us.ibm.com>,
	linux-ext4@vger.kernel.org
Subject: [PATCH 05/13] crc32: Fix mixing of endian-specific types
Date: Wed, 18 Jan 2012 14:28:07 -0800	[thread overview]
Message-ID: <20120118222807.4079.77106.stgit@elm3c44.beaverton.ibm.com> (raw)
In-Reply-To: <20120118222733.4079.13377.stgit@elm3c44.beaverton.ibm.com>

crc32.c in its original version freely mixed u32, __le32 and __be32 types
which caused warnings from sparse with __CHECK_ENDIAN__.
This patch fixes these by forcing the types to u32.

From: Bob Pearson <rpearson@systemfabricworks.com>
Signed-off-by: Bob Pearson <rpearson@systemfabricworks.com>
[djwong@us.ibm.com: Minor changelog tweaks]
Signed-off-by: Darrick J. Wong <djwong@us.ibm.com>
---
 lib/crc32.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)


diff --git a/lib/crc32.c b/lib/crc32.c
index bf03922..7394288 100644
--- a/lib/crc32.c
+++ b/lib/crc32.c
@@ -28,13 +28,13 @@
 #include "crc32defs.h"
 
 #if CRC_LE_BITS == 8
-# define tole(x) __constant_cpu_to_le32(x)
+# define tole(x) ((__force u32) __constant_cpu_to_le32(x))
 #else
 # define tole(x) (x)
 #endif
 
 #if CRC_BE_BITS == 8
-# define tobe(x) __constant_cpu_to_be32(x)
+# define tobe(x) ((__force u32) __constant_cpu_to_be32(x))
 #else
 # define tobe(x) (x)
 #endif
@@ -128,9 +128,9 @@ u32 __pure crc32_le(u32 crc, unsigned char const *p, size_t len)
 # elif CRC_LE_BITS == 8
 	const u32      (*tab)[] = crc32table_le;
 
-	crc = __cpu_to_le32(crc);
+	crc = (__force u32) __cpu_to_le32(crc);
 	crc = crc32_body(crc, p, len, tab);
-	crc = __le32_to_cpu(crc);
+	crc = __le32_to_cpu((__force __le32)crc);
 #endif
 	return crc;
 }
@@ -171,9 +171,9 @@ u32 __pure crc32_be(u32 crc, unsigned char const *p, size_t len)
 # elif CRC_BE_BITS == 8
 	const u32      (*tab)[] = crc32table_be;
 
-	crc = __cpu_to_be32(crc);
+	crc = (__force u32) __cpu_to_be32(crc);
 	crc = crc32_body(crc, p, len, tab);
-	crc = __be32_to_cpu(crc);
+	crc = __be32_to_cpu((__force __be32)crc);
 # endif
 	return crc;
 }

  parent reply	other threads:[~2012-01-18 22:28 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-01-18 22:27 [PATCH v5.4 00/13] crc32c: Add faster algorithm and self-test code Darrick J. Wong
2012-01-18 22:27 ` [PATCH 01/13] crc32: removed two instances of trailing whitespaces Darrick J. Wong
2012-01-18 22:27 ` [PATCH 02/13] crc32: Move long comment about crc32 fundamentals to Documentation/ Darrick J. Wong
2012-01-18 22:27 ` [PATCH 03/13] crc32: Simplify unit test code Darrick J. Wong
2012-01-18 22:28 ` [PATCH 04/13] crc32: Miscellaneous cleanups Darrick J. Wong
2012-01-18 22:28 ` Darrick J. Wong [this message]
2012-01-18 22:28 ` [PATCH 06/13] crc32: Make CRC_*_BITS definition correspond to actual bit counts Darrick J. Wong
2012-01-18 22:28 ` [PATCH 07/13] crc32: Add slice-by-8 algorithm to existing code Darrick J. Wong
2012-01-18 22:28 ` [PATCH 08/13] crc32: Optimize loop counter for x86 Darrick J. Wong
2012-01-18 22:28 ` [PATCH 09/13] crc32: Add note about this patchset to crc32.c Darrick J. Wong
2012-01-18 22:28 ` [PATCH 10/13] crc32: Bolt on crc32c Darrick J. Wong
2012-01-18 22:28 ` [PATCH 11/13] crypto: crc32c should use library implementation Darrick J. Wong
2012-01-18 22:28 ` [PATCH 12/13] crc32: Add self-test code for crc32c Darrick J. Wong
2012-01-18 22:29 ` [PATCH 13/13] crc32: Select an algorithm via kconfig Darrick J. Wong
2012-01-18 23:01 ` [PATCH v5.4 00/13] crc32c: Add faster algorithm and self-test code Andrew Morton

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=20120118222807.4079.77106.stgit@elm3c44.beaverton.ibm.com \
    --to=djwong@us.ibm.com \
    --cc=adilger.kernel@dilger.ca \
    --cc=akpm@linux-foundation.org \
    --cc=cmm@us.ibm.com \
    --cc=herbert@gondor.apana.org.au \
    --cc=joakim.tjernlund@transmode.se \
    --cc=linux-crypto@vger.kernel.org \
    --cc=linux-ext4@vger.kernel.org \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=rpearson@systemfabricworks.com \
    --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).