OpenAFS Master Repository branch, openafs-devel-1_7_x, updated. openafs-devel-1_7_1-26-g0a3ffab
Gerrit Code Review
gerrit@openafs.org
Sat, 12 Nov 2011 15:43:08 -0800 (PST)
The following commit has been merged in the openafs-devel-1_7_x branch:
commit 0a3ffab3c7f6758b584f49b84bb005c9dd8aa664
Author: Simon Wilkinson <sxw@your-file-system.com>
Date: Sun Jul 10 13:46:11 2011 +0100
Clean up assertion
The AFS code has multiple different assertion implementations in
userspace. This patchset is the start of bringing some sanity to them.
In rx, we have osi_Assert, a user/kernel assertion macro. This is only
available to libraries which have RX dependencies
In util, we redefine the standard 'assert()' macro to provide a
cross-platform assertion solution.
Because util has an RX dependency, neither of these provide an
assertion solution for libraries which should be independent of rx.
So, pull the assertion code out of util, and put it into opr, as a new
opr_Assert() macro. Implement the userspace osi_Assert in terms of this
macro, leaving the kernel variant untouched.
Update callers to the new macro and header file names.
Change-Id: If923440c0f4289847749cf7fff1c38bae4d8214f
Reviewed-on: http://gerrit.openafs.org/5394
Reviewed-by: Derrick Brashear <shadow@dementix.org>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
(cherry-picked from cac74242728ad97e3ce9cef0a949d58c237250f6)
Reviewed-on: http://gerrit.openafs.org/5856
Tested-by: Jeffrey Altman <jaltman@secure-endpoints.com>
Reviewed-by: Jeffrey Altman <jaltman@secure-endpoints.com>
src/WINNT/afsd/fs.c | 3 ++-
src/WINNT/afsd/fs_acl.c | 3 ++-
src/WINNT/afsd/fs_utils.c | 2 ++
src/afs/UKERNEL/sysincludes.h | 4 ----
src/afsd/afsd.c | 3 ++-
src/bu_utils/Makefile.in | 3 ++-
src/butc/Makefile.in | 3 ++-
src/butc/tcmain.c | 1 -
src/butc/tcprocs.c | 3 +--
src/butc/tcudbprocs.c | 3 +--
src/dviced/Makefile.in | 5 +----
src/dvolser/Makefile.in | 6 ++----
src/gtx/Makefile.in | 1 +
src/kauth/admin_tools.c | 1 +
src/libadmin/client/NTMakefile | 1 +
src/libafsrpc/Makefile.in | 5 ++---
src/libuafs/Makefile.common.in | 8 ++++----
src/lwp/lock.c | 7 ++-----
src/lwp/lock.h | 1 -
src/opr/Makefile.in | 4 ++++
src/opr/NTMakefile | 3 ++-
src/opr/assert.c | 27 +++++++++++++++++++++++++++
src/opr/opr.h | 6 ++++++
src/opr/opr_assert.h | 6 ++++++
src/shlibafsrpc/Makefile.in | 4 ++--
src/shlibafsrpc/libafsrpc.map | 2 +-
src/tbudb/Makefile.in | 6 ++----
src/tptserver/Makefile.in | 3 ++-
src/tsalvaged/Makefile.in | 5 +----
src/tsalvaged/salvsync-debug.c | 2 +-
src/tubik/Makefile.in | 9 ++++-----
src/tviced/Makefile.in | 3 ++-
src/tviced/serialize_state.c | 1 -
src/tviced/state_analyzer.c | 2 +-
src/tvlserver/Makefile.in | 8 +++-----
src/tvolser/Makefile.in | 8 +++-----
src/ubik/remote.c | 3 ++-
src/ubik/ubik.p.h | 1 -
src/ubik/ubikclient.c | 1 -
src/usd/usd_file.c | 5 ++---
src/util/Makefile.in | 12 +-----------
src/util/NTMakefile | 3 ---
src/util/afs_assert.h | 15 ---------------
src/util/afsutil_prototypes.h | 5 -----
src/util/assert.c | 35 -----------------------------------
src/util/dirpath.c | 3 ++-
src/util/ktime.c | 1 +
src/util/netutils.c | 1 -
src/util/pthread_glock.h | 6 +++---
src/util/pthread_nosigs.h | 4 ++--
src/util/serverLog.c | 1 -
src/util/softsig.c | 4 ++--
src/venus/fs.c | 2 +-
src/viced/afsfileprocs.c | 1 -
src/viced/callback.c | 2 --
src/viced/host.c | 1 -
src/viced/host.h | 1 -
src/viced/physio.c | 1 -
src/viced/viced.c | 1 -
src/viced/viced.h | 1 -
src/vol/clone.c | 1 -
src/vol/daemon_com.c | 1 -
src/vol/fssync-client.c | 1 -
src/vol/fssync-debug.c | 1 -
src/vol/ihandle.c | 1 -
src/vol/namei_ops.c | 1 -
src/vol/ntops.c | 1 -
src/vol/nuke.c | 1 -
src/vol/partition.c | 1 -
src/vol/purge.c | 1 -
src/vol/salvaged.c | 1 -
src/vol/salvager.c | 1 -
src/vol/salvsync-server.c | 1 -
src/vol/vg_cache.c | 2 --
src/vol/vg_scan.c | 1 -
src/vol/vnode.c | 2 --
src/vol/vol-salvage.c | 1 -
src/vol/volume.c | 2 +-
src/vol/volume_inline.h | 3 +++
src/vol/vutil.c | 2 --
src/volser/dumpstuff.c | 1 -
src/volser/physio.c | 1 -
src/volser/vol_split.c | 1 -
src/volser/volmain.c | 1 -
src/volser/volprocs.c | 1 -
src/volser/volser.p.h | 1 -
src/volser/voltrans.c | 1 -
87 files changed, 115 insertions(+), 190 deletions(-)
--
OpenAFS Master Repository