From mboxrd@z Thu Jan 1 00:00:00 1970 From: Oren Laadan Subject: Re: [PATCH 1/1] mktree: long is bigger on 64-bit (v2) Date: Thu, 14 May 2009 06:12:39 -0400 Message-ID: <4A0BEE97.1000409@cs.columbia.edu> References: <20090514022932.GA29738@us.ibm.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20090514022932.GA29738-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org> 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: "Serge E. Hallyn" Cc: Linux Containers , Nathan T Lynch List-Id: containers.vger.kernel.org applied, thanks. Serge E. Hallyn wrote: > 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)