Linux Container Development
 help / color / mirror / Atom feed
From: "Serge E. Hallyn" <serue-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
To: Oren Laadan <orenl-eQaUEPhvms7ENvBUuze7eA@public.gmane.org>,
	Nathan T Lynch <natlynch-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
Cc: Linux Containers <containers-qjLDD68F18O7TbgM5vRIOg@public.gmane.org>
Subject: [PATCH 1/1] mktree: long is bigger on 64-bit (v2)
Date: Wed, 13 May 2009 21:29:32 -0500	[thread overview]
Message-ID: <20090514022932.GA29738@us.ibm.com> (raw)

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 <serue-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
---
 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

             reply	other threads:[~2009-05-14  2:29 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-05-14  2:29 Serge E. Hallyn [this message]
     [not found] ` <20090514022932.GA29738-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
2009-05-14 10:12   ` [PATCH 1/1] mktree: long is bigger on 64-bit (v2) Oren Laadan

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=20090514022932.GA29738@us.ibm.com \
    --to=serue-r/jw6+rmf7hqt0dzr+alfa@public.gmane.org \
    --cc=containers-qjLDD68F18O7TbgM5vRIOg@public.gmane.org \
    --cc=natlynch-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org \
    --cc=orenl-eQaUEPhvms7ENvBUuze7eA@public.gmane.org \
    /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