From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Serge E. Hallyn" Subject: [PATCH 1/1] mktree: long is bigger on 64-bit (v2) Date: Wed, 13 May 2009 21:29:32 -0500 Message-ID: <20090514022932.GA29738@us.ibm.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: containers-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Errors-To: containers-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org To: Oren Laadan , Nathan T Lynch Cc: Linux Containers List-Id: containers.vger.kernel.org mktree's hash function assumes that long is 32 bits. Fix. This version takes Nathan's suggestion of using sizeof(key) instead of sizeof(long). Signed-off-by: Serge Hallyn --- mktree.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/mktree.c b/mktree.c index 7a8cecc..c1f13b8 100644 --- a/mktree.c +++ b/mktree.c @@ -1291,7 +1291,7 @@ static void hash_exit(struct ckpt_ctx *ctx) static inline int hash_func(long key) { unsigned long hash = key * GOLDEN_RATIO_PRIME_32; - return (hash >> (32 - HASH_BITS)); + return (hash >> (sizeof(key)*8 - HASH_BITS)); } static int hash_insert(struct ckpt_ctx *ctx, long key, void *data) -- 1.6.1.1