OpenAFS Master Repository branch, openafs-stable-1_6_x, updated. openafs-stable-1_6_0b-173-g196895f

Gerrit Code Review gerrit@openafs.org
Thu, 8 Dec 2011 20:39:11 -0800 (PST)


The following commit has been merged in the openafs-stable-1_6_x branch:
commit 196895f58b086110db3f020e36fb029e14fc619b
Author: Ben Kaduk <kaduk@mit.edu>
Date:   Sat Dec 3 14:37:09 2011 -0500

    FBSD: switch afsi_SetServerIPRank implementation
    
    Upstream has removed the ia_net{,mask} elements from
    struct in_ifaddr, so we can no longer use them directly.
    Switch to passing an rx_ifaddr_t (i.e. struct ifaddr*) in instead,
    as that uses a slightly different codepath which still works
    for our purposes.
    
    We compile the kernel module with -Werror, so storing a pointer
    (memcpy return value) in an int is forbidden, hence the conditional
    declaration of 't'.
    
    Reviewed-on: http://gerrit.openafs.org/6203
    Tested-by: BuildBot <buildbot@rampaginggeek.com>
    Reviewed-by: Derrick Brashear <shadow@dementix.org>
    (cherry picked from commit 1ef8dc3dfbddcbe5610c276afc627c9fcfe30a65)
    
    Change-Id: Icb338331c879dc4cbd69ae565b115de000e8d3d0
    Reviewed-on: http://gerrit.openafs.org/6235
    Tested-by: BuildBot <buildbot@rampaginggeek.com>
    Reviewed-by: Jeffrey Altman <jaltman@secure-endpoints.com>

 src/afs/afs_server.c |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

-- 
OpenAFS Master Repository