OpenAFS Master Repository branch, master, updated. BP--openafs-stable-1_6_x-316-g34767c6

Gerrit Code Review gerrit@openafs.org
Wed, 27 Oct 2010 10:23:05 -0700 (PDT)


The following commit has been merged in the master branch:
commit 34767c6a0f914960c9a1efabe69dd9c312a2b400
Author: Derrick Brashear <shadow@dementia.org>
Date:   Sun Oct 17 23:39:47 2010 -0400

    down with assert, up with osi_Assert
    
    because NDEBUG breaks things which happen inside an assert,
    be done with that. instead, call osi_Assert wherever possible.
    doesn't work for code which builds before rx; those cases we handle
    by ensuring no operations happen inside the assert(). side effect:
    move all pthread operations wrapped in asserts to MUTEX_mumble and
    CV_mumble calls where those exist, so the assertions happen all in
    one set of macroes.
    
    Change-Id: I9fd8a0fdfdaed5ed55de3e5c0c4673d4714e7441
    Reviewed-on: http://gerrit.openafs.org/3001
    Reviewed-by: Derrick Brashear <shadow@dementia.org>
    Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
    Tested-by: Derrick Brashear <shadow@dementia.org>

 src/afsd/afsd.c               |   13 +-
 src/afsd/afsd_kernel.c        |    1 -
 src/audit/audit.c             |   12 +-
 src/budb/db_dump.c            |   18 +-
 src/budb/dbs_dump.c           |   32 ++--
 src/butc/tcmain.c             |    4 -
 src/kauth/kalog.c             |    1 -
 src/libafsrpc/afsrpc.def      |    1 +
 src/log/unlog.c               |    1 -
 src/lwp/iomgr.c               |    6 +-
 src/lwp/lock.c                |   47 +++---
 src/lwp/lock.h                |    8 +-
 src/lwp/lwp.c                 |   64 +++++---
 src/lwp/lwp.h                 |    4 +-
 src/lwp/rw.c                  |   16 +--
 src/ptserver/utils.c          |   13 +-
 src/rx/rx.c                   |    7 +-
 src/rx/rx_lwp.h               |    4 +
 src/shlibafsrpc/libafsrpc.map |    3 +
 src/tsalvaged/Makefile.in     |    7 +-
 src/ubik/disk.c               |    4 +-
 src/ubik/recovery.c           |    9 +-
 src/ubik/ubik.c               |   34 ++--
 src/ubik/ubik.p.h             |   10 +-
 src/ubik/ubikclient.c         |   15 +-
 src/util/Makefile.in          |    8 +-
 src/util/netutils.c           |   36 ++---
 src/util/potpourri.h          |  110 -------------
 src/util/pthread_glock.h      |    6 +-
 src/util/serverLog.c          |   10 +-
 src/util/thread_pool.c        |   55 ++++----
 src/util/work_queue.c         |  216 +++++++++++++--------------
 src/viced/afsfileprocs.c      |  106 +++++++-------
 src/viced/callback.c          |   23 ++--
 src/viced/host.c              |   92 ++++++------
 src/viced/host.h              |   10 +-
 src/viced/viced.c             |   68 ++++-----
 src/viced/viced.h             |   22 +--
 src/vol/Makefile.in           |    5 +-
 src/vol/NTMakefile            |    1 +
 src/vol/clone.c               |    6 +-
 src/vol/daemon_com.c          |    4 +-
 src/vol/fssync-client.c       |   12 +-
 src/vol/fssync-debug.c        |    4 +-
 src/vol/fssync-server.c       |   46 +++---
 src/vol/ihandle.c             |   76 +++++-----
 src/vol/ihandle.h             |   13 +-
 src/vol/listinodes.c          |    8 +-
 src/vol/namei_ops.c           |   14 +-
 src/vol/ntops.c               |    2 +-
 src/vol/nuke.c                |    4 -
 src/vol/partition.c           |   34 ++---
 src/vol/physio.c              |    2 +-
 src/vol/salvaged.c            |   62 ++++----
 src/vol/salvsync-client.c     |    1 -
 src/vol/salvsync-server.c     |   45 +++---
 src/vol/vg_cache.c            |   12 +-
 src/vol/vg_scan.c             |    2 +-
 src/vol/vnode.c               |   32 ++---
 src/vol/vnode_inline.h        |   22 ++--
 src/vol/vol-salvage.c         |  158 ++++++++++----------
 src/vol/volume.c              |  338 ++++++++++++++++++++---------------------
 src/vol/volume.h              |   37 ++---
 src/vol/volume_inline.h       |   12 +-
 src/vol/vutil.c               |   66 +++-----
 src/volser/Makefile.in        |    3 +-
 src/volser/dumpstuff.c        |   28 ++--
 src/volser/physio.c           |    2 +-
 src/volser/vol_split.c        |    4 -
 src/volser/volmain.c          |   10 +-
 src/volser/volprocs.c         |   12 +-
 src/volser/volser.p.h         |   10 +-
 src/volser/voltrans.c         |    4 -
 73 files changed, 985 insertions(+), 1202 deletions(-)

-- 
OpenAFS Master Repository