OpenAFS Master Repository branch, openafs-stable-1_6_x, updated. openafs-devel-1_5_78-35-g556772c

Gerrit Code Review gerrit@openafs.org
Mon, 13 Dec 2010 20:55:27 -0800 (PST)


The following commit has been merged in the openafs-stable-1_6_x branch:
commit 556772c9639ed2ab00a7951df01cb98bfb6b24bf
Author: Anders Kaseorg <andersk@mit.edu>
Date:   Sat Nov 6 03:03:19 2010 -0400

    Linux: Fix AFS_NORETURN violation with osi_AssertFailK
    
    Commit d86f0c44d3c5910a6b54895484dc0286eac9bc73 changed the
    AFS_LINUX26_ENV implementation of osi_AssertFailK so that it returns,
    contradicting its AFS_NORETURN prototype, in an effort to make the
    following BUG() display the right line number.  To fix this, move the
    returning implementation into its only caller, the osi_Assert macro.
    
    This fixes possible compiler misoptimizations due to
    
    rx_kcommon.c:255:1: warning: ‘noreturn’ function does return
    
    Signed-off-by: Anders Kaseorg <andersk@mit.edu>
    Reviewed-on: http://gerrit.openafs.org/3276
    Reviewed-by: Andrew Deason <adeason@sinenomine.net>
    Tested-by: BuildBot <buildbot@rampaginggeek.com>
    Reviewed-by: Marc Dionne <marc.c.dionne@gmail.com>
    Reviewed-by: Derrick Brashear <shadow@dementia.org>
    (cherry picked from commit 1519144f83925d82117f31ce0872f77660f197ee)
    
    Change-Id: I2b630a3264d04d6fbb626b7ef997da9bf081ade1
    Reviewed-on: http://gerrit.openafs.org/3513
    Tested-by: BuildBot <buildbot@rampaginggeek.com>
    Reviewed-by: Derrick Brashear <shadow@dementia.org>

 src/rx/rx_kcommon.c    |    6 ------
 src/rx/rx_prototypes.h |    4 +++-
 2 files changed, 3 insertions(+), 7 deletions(-)

-- 
OpenAFS Master Repository