OpenAFS Master Repository branch, master, updated. openafs-devel-1_5_76-3071-gf5a643a
Gerrit Code Review
gerrit@openafs.org
Tue, 30 Oct 2012 02:57:07 -0700 (PDT)
The following commit has been merged in the master branch:
commit f5a643ad6dbcbf1785eac274f9dec79ef65928f3
Author: Simon Wilkinson <sxw@your-file-system.com>
Date: Sat Oct 20 23:14:41 2012 +0100
Add opr/lock.h and tidy locking macros
The MUTEX_* and CV_* macros leaked from RX a while ago - they mean
that most of the pthreaded tree has a dependency on RX, as well as
further confusing the difference between userspace and kernel.
Tidy all of this up so that we have opr_mutex_* and opr_cv_* macros
to handle portable locking, and use these throughout the userspace
tree. Only kernel code should now use MUTEX_* and CV_*.
Provide opr/lockstub.h as a header that can be used by non-pthreaded
code to easily stub out these functions.
Change-Id: I24be525c7667641134d50561ce7f1e2d752cdf1f
Reviewed-on: http://gerrit.openafs.org/8280
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>
src/budb/db_dump.c | 16 ++--
src/budb/dbs_dump.c | 24 +++--
src/lwp/lock.c | 30 ++++----
src/lwp/lock.h | 6 +-
src/opr/Makefile.in | 8 ++
src/opr/NTMakefile | 5 +
src/opr/lockstub.h | 50 +++++++++++
src/opr/opr_lock.h | 66 ++++++++++++++
src/rx/rx_pthread.h | 70 +++-------------
src/rxgen/rpc_main.c | 3 +
src/ubik/beacon.c | 6 ++
src/ubik/disk.c | 10 ++-
src/ubik/lock.c | 3 +
src/ubik/recovery.c | 16 +++-
src/ubik/remote.c | 6 ++
src/ubik/ubik.c | 26 ++++--
src/ubik/ubik.p.h | 24 +++---
src/ubik/ubikclient.c | 3 +
src/ubik/vote.c | 5 +
src/util/thread_pool.c | 48 +++++-----
src/util/work_queue.c | 197 +++++++++++++++++++++----------------------
src/viced/afsfileprocs.c | 5 +-
src/viced/callback.c | 7 +-
src/viced/fsstats.c | 1 +
src/viced/host.c | 12 +--
src/viced/host.h | 4 +-
src/viced/serialize_state.c | 3 +-
src/viced/viced.c | 20 ++--
src/viced/viced.h | 8 +-
src/vol/fssync-client.c | 10 ++-
src/vol/fssync-debug.c | 2 +-
src/vol/fssync-server.c | 7 +-
src/vol/ihandle.c | 5 +-
src/vol/ihandle.h | 4 +-
src/vol/namei_ops.c | 7 +-
src/vol/partition.c | 3 +
src/vol/salvaged.c | 43 +++++-----
src/vol/salvsync-client.c | 2 +-
src/vol/salvsync-server.c | 2 +-
src/vol/vg_cache.c | 2 +-
src/vol/vg_scan.c | 2 +-
src/vol/vnode.c | 3 +
src/vol/vnode_inline.h | 4 +-
src/vol/vol-salvage.c | 4 +
src/vol/volume.c | 135 +++++++++++++++--------------
src/vol/volume.h | 20 ++--
src/vol/volume_inline.h | 4 +-
src/vol/vutil.c | 46 ++++++-----
src/volser/volmain.c | 4 +-
src/volser/volprocs.c | 4 +
src/volser/volser.p.h | 8 +-
src/volser/voltrans.c | 3 +
52 files changed, 589 insertions(+), 417 deletions(-)
--
OpenAFS Master Repository