OpenAFS Master Repository branch, master, updated. openafs-devel-1_9_2-324-g60da5c6
Gerrit Code Review
gerrit@openafs.org
Fri, 26 Sep 2025 13:08:34 -0400
The following commit has been merged in the master branch:
commit 60da5c6988f4192c98ad643141e14991b3166c6e
Author: Alex Dehnert <adehnert@mit.edu>
Date: Sat Aug 23 12:18:06 2025 -0400
lwp: Rename lock.h to afs/afs_lock.h
OpenAFS installs a /usr/include/lock.h, which is a very generic name for
an OpenAFS-specific file. It seems prudent to avoid using such a generic
name to avoid conflicts.
In particular, Python 3.13 *also* introduces a "lock.h" file, which means that
software that builds with OpenAFS and Python is likely to break (see
https://github.com/mit-athena/python-afs/issues/6#issuecomment-3089981708).
Python is renaming their lock.h, probably starting in Python 3.15, but it would
be good to deconflict on machines with 3.13 and 3.14 as well as other projects
that might use that name.
This change was partially automated, using the following commands:
git grep --name-only '"lock.h"' src/vol | xargs sed -i -e 's%^#include "lock.h"%#include <afs/afs_lock.h>%'
git grep --name-only '<lock.h>' | xargs sed -i -e 's%^#include <lock.h>%#include <afs/afs_lock.h>%'
find . -name Makefile.in | xargs sed -i -e 's#${TOP_INCDIR}/lock.h#${TOP_INCDIR}/afs/afs_lock.h#'
Change-Id: Ida911d0c4dcc8c68726e3a641900bf56e2598c9d
Reviewed-on: https://gerrit.openafs.org/16496
Reviewed-by: Michael Meffie <mmeffie@sinenomine.net>
Reviewed-by: Cheyenne Wills <cwills@sinenomine.net>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
doc/protocol/rx-spec.h | 2 +-
doc/txt/ubik.txt | 2 +-
src/WINNT/install/wix/files.wxi | 2 +-
src/aklog/klog.c | 2 +-
src/audit/audit.c | 2 +-
src/bucoord/bc_status.c | 2 +-
src/bucoord/commands.c | 2 +-
src/bucoord/main.c | 2 +-
src/bucoord/ubik_db_if.c | 2 +-
src/budb/Makefile.in | 2 +-
src/budb/database.h | 2 +-
src/budb/ol_verify.c | 2 +-
src/budb/procs.c | 2 +-
src/butc/dbentries.c | 2 +-
src/butc/dump.c | 2 +-
src/butc/list.c | 2 +-
src/butc/lwps.c | 2 +-
src/butc/read_tape.c | 2 +-
src/butc/recoverDb.c | 2 +-
src/butc/tcmain.c | 2 +-
src/butc/tcprocs.c | 2 +-
src/butc/tcstatus.c | 2 +-
src/butc/tcudbprocs.c | 2 +-
src/config/icl.h | 2 +-
src/dir/buffer.c | 2 +-
src/finale/Makefile.in | 2 +-
src/gtx/gtxtextcb.h | 2 +-
src/kauth/Makefile.in | 2 +-
src/kauth/admin_tools.c | 2 +-
src/kauth/ka_util.c | 2 +-
src/kauth/kaprocs.c | 2 +-
src/kauth/kas.c | 2 +-
src/kauth/kaserver.c | 2 +-
src/kauth/katoken.c | 2 +-
src/kauth/klog.c | 2 +-
src/kauth/kpasswd.c | 2 +-
src/kauth/manyklog.c | 2 +-
src/kauth/test/multiklog.c | 2 +-
src/kauth/test/test_badtix.c | 2 +-
src/libadmin/vos/vsprocs.h | 2 +-
src/lwp/Makefile.in | 15 +--
src/lwp/NTMakefile | 2 +-
src/lwp/afs_lock.h | 220 +++++++++++++++++++++++++++++++++++
src/lwp/lock.c | 2 +-
src/lwp/lock.h | 220 -----------------------------------
src/lwp/test/rw.c | 2 +-
src/packaging/RedHat/openafs.spec.in | 2 +-
src/ptserver/Makefile.in | 4 +-
src/ptserver/pt_util.c | 2 +-
src/ptserver/ptclient.h | 2 +-
src/ptserver/ptprocs.c | 2 +-
src/ptserver/ptserver.c | 2 +-
src/ptserver/ptubik.c | 2 +-
src/ptserver/ptutils.c | 2 +-
src/ptserver/utils.c | 2 +-
src/tbudb/Makefile.in | 2 +-
src/tools/dumpscan/dumpscan.h | 2 +-
src/tools/dumpscan/dumptool.c | 2 +-
src/tptserver/Makefile.in | 2 +-
src/tsalvaged/salvsync-debug.c | 2 +-
src/tubik/Makefile.in | 4 +-
src/tvlserver/Makefile.in | 2 +-
src/ubik/Makefile.in | 4 +-
src/ubik/beacon.c | 2 +-
src/ubik/lock.c | 2 +-
src/ubik/phys.c | 2 +-
src/ubik/remote.c | 2 +-
src/ubik/ubik.c | 2 +-
src/ubik/ubik.p.h | 2 +-
src/ubik/ubikclient.c | 2 +-
src/ubik/ubikcmd.c | 2 +-
src/ubik/udebug.c | 2 +-
src/ubik/uinit.c | 2 +-
src/ubik/utst_client.c | 2 +-
src/ubik/utst_server.c | 2 +-
src/ubik/vote.c | 2 +-
src/venus/cmdebug.c | 2 +-
src/viced/physio.c | 2 +-
src/viced/state_analyzer.c | 2 +-
src/vlserver/Makefile.in | 2 +-
src/vlserver/vlclient.c | 2 +-
src/vlserver/vlprocs.c | 2 +-
src/vlserver/vlserver.c | 2 +-
src/vlserver/vlutils.c | 2 +-
src/vol/Makefile.in | 2 +-
src/vol/clone.c | 2 +-
src/vol/daemon_com.c | 2 +-
src/vol/fssync-client.c | 2 +-
src/vol/fssync-debug.c | 2 +-
src/vol/fssync-server.c | 2 +-
src/vol/listinodes.c | 2 +-
src/vol/namei_ops.c | 2 +-
src/vol/ntops.c | 2 +-
src/vol/nuke.c | 2 +-
src/vol/partition.c | 2 +-
src/vol/partition.h | 2 +-
src/vol/purge.c | 2 +-
src/vol/salvaged.c | 2 +-
src/vol/salvager.c | 2 +-
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 | 6 +-
src/vol/vol-bless.c | 2 +-
src/vol/vol-info.c | 2 +-
src/vol/vol-salvage.c | 2 +-
src/vol/volinfo-main.c | 2 +-
src/vol/volscan-main.c | 2 +-
src/vol/volume.c | 2 +-
src/vol/volume_inline.h | 2 +-
src/vol/vutil.c | 2 +-
src/volser/dumpstuff.c | 2 +-
src/volser/restorevol.c | 2 +-
src/volser/vol-dump.c | 2 +-
src/volser/vol_split.c | 2 +-
src/volser/volmain.c | 2 +-
src/volser/volprocs.c | 2 +-
src/volser/voltrans.c | 2 +-
src/volser/vos.c | 2 +-
src/volser/vsprocs.c | 2 +-
src/volser/vsutils.c | 2 +-
122 files changed, 352 insertions(+), 351 deletions(-)
--
OpenAFS Master Repository