From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matt Helsley Subject: Re: [PATCH 1/1] mktree: long is bigger on 64-bit Date: Tue, 12 May 2009 21:48:53 -0700 Message-ID: <20090513044853.GH3912@us.ibm.com> References: <20090513030830.GA11265@us.ibm.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline In-Reply-To: <20090513030830.GA11265-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 List-Id: containers.vger.kernel.org On Tue, May 12, 2009 at 10:08:30PM -0500, Serge E. Hallyn wrote: > mktree's hash function assumes that long is 32 bits. Fix. > > Signed-off-by: Serge Hallyn > --- > mktree.c | 6 ++++-- > 1 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/mktree.c b/mktree.c > index 7a8cecc..0195974 100644 > --- a/mktree.c > +++ b/mktree.c > @@ -724,6 +724,7 @@ static int ckpt_make_tree(struct ckpt_ctx *ctx, struct task *task) > struct task *child; > struct pid_swap swap; > pid_t newpid; > + int status; > int ret; > > ckpt_dbg("pid %d: pid %d sid %d parent %d\n", > @@ -765,7 +766,7 @@ static int ckpt_make_tree(struct ckpt_ctx *ctx, struct task *task) > /* 3rd pass: bring out your deads ... */ > for (child = task->children; child; child = child->next_sib) { > if (child->flags & TASK_DEAD) { > - ret = waitpid(child->rpid, NULL, 0); > + ret = waitpid(child->rpid, &status, 0); > if (ret < 0) { > perror("waitpid"); > return -1; > @@ -1291,7 +1292,8 @@ 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 >> (32 - HASH_BITS)); > + return (hash >> (sizeof(long)*8 - HASH_BITS)); I'm guessing the // comment isn't intentional. Also, how about using sizeof(key) instead of manually inserting its type? Cheers, -Matt Helsley