OpenAFS Master Repository branch, master, updated. BP--openafs-stable-1_6_x-1336-g8017773

[Gerrit Code Review]

The following commit has been merged in the master branch:
commit 8017773587bf28a58e480f634fdccc287c443d3b
Author: Andrew Deason <adeason@sinenomine.net>
Date:   Fri Jun 24 16:23:13 2011 -0500

    Remove nonsensical bozon-lock defines
    
    Currently there are two preprocessor defines related to bozon locks:
    AFS_BOZONLOCK_ENV, and AFS_NOBOZO_LOCK. The former creates the pvnLock
    member of a struct vcache, and controls calls to e.g. afs_BozonLock in
    cross-platform code. The latter, if defined, turns calls to e.g.
    afs_BozonLock into no-ops.
    
    It doesn't make any sense to have both of these, since if
    AFS_BOZONLOCK_ENV and AFS_NOBOZO_LOCK are defined, the pvnLock member
    exists but is never used, since afs_BozonLock &co are no-ops. On
    Solaris, the only platform where AFS_NOBOZO_LOCK is currently defined
    (DUX used to define it before DUX was dropped), this is the case.
    
    So to make things a bit more clear, get rid of the AFS_NOBOZO_LOCK
    define, and just use AFS_BOZONLOCK_ENV to dictate whether we do
    anything with bozon locks (ppc_darwin_80 appears to be the only
    platform at this time).
    
    Remove AFS_BOZONLOCK_ENV from Solaris param files, since it doesn't
    use bozon locks. Remove all references to pvnLock in Solaris-specific
    code.
    
    Change-Id: Id72c14ec5485d35b853d38e2ea1a944a385f2b5b
    Reviewed-on: http://gerrit.openafs.org/4889
    Reviewed-by: Derrick Brashear <shadow@dementia.org>
    Tested-by: Derrick Brashear <shadow@dementia.org>

 src/afs/SOLARIS/osi_vcache.c   |    4 ----
 src/afs/SOLARIS/osi_vm.c       |    2 --
 src/afs/SOLARIS/osi_vnodeops.c |   19 +------------------
 src/afs/VNOPS/afs_vnop_attrs.c |    4 +++-
 src/afs/afs_lock.c             |    4 ++--
 src/afs/afs_prototypes.h       |    2 +-
 src/afs/lock.h                 |   19 ++-----------------
 src/config/param.sun4x_510.h   |    1 -
 src/config/param.sun4x_511.h   |    1 -
 src/config/param.sun4x_58.h    |    1 -
 src/config/param.sun4x_59.h    |    1 -
 src/config/param.sunx86_510.h  |    1 -
 src/config/param.sunx86_511.h  |    1 -
 src/config/param.sunx86_58.h   |    1 -
 src/config/param.sunx86_59.h   |    1 -
 15 files changed, 9 insertions(+), 53 deletions(-)

-- 
OpenAFS Master Repository