OpenAFS Master Repository branch, openafs-stable-1_6_x, updated. openafs-stable-1_6_0pre3-15-g4d691ae

Gerrit Code Review gerrit@openafs.org
Thu, 24 Mar 2011 09:23:46 -0700 (PDT)


The following commit has been merged in the openafs-stable-1_6_x branch:
commit 4d691ae10903e01db4d6b24a4eb02da536cadf7c
Author: Andrew Deason <adeason@sinenomine.net>
Date:   Wed Mar 16 14:44:56 2011 -0500

    salvager: Fix volume parsing on 64-bit
    
    When an unsigned long is wider than an afs_uint32, comparing the
    afs_uint32 vid to ULONG_MAX is always going to be false (which the
    compiler can warn us about). Fix this by storing to an unsigned long,
    and converting to a volume id after ensuring that the result is not
    too large.
    
    (cherry picked from commit ce5e263b488f8cb85662031ee08eea448dab2d27)
    Reviewed-on: http://gerrit.openafs.org/4244
    Tested-by: BuildBot <buildbot@rampaginggeek.com>
    Reviewed-by: Simon Wilkinson <sxw@inf.ed.ac.uk>
    Tested-by: Derrick Brashear <shadow@dementia.org>
    Reviewed-by: Derrick Brashear <shadow@dementia.org>
    
    Change-Id: Iec2d640daed1e9c175d17823750f272297f890a7
    Reviewed-on: http://gerrit.openafs.org/4283
    Tested-by: BuildBot <buildbot@rampaginggeek.com>
    Reviewed-by: Derrick Brashear <shadow@dementia.org>

 src/vol/salvaged.c |    9 ++++++++-
 src/vol/salvager.c |    9 ++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

-- 
OpenAFS Master Repository