OpenAFS Master Repository branch, master, updated. openafs-devel-1_9_0-105-g6b96a49
Gerrit Code Review
gerrit@openafs.org
Fri, 5 Feb 2021 00:30:34 -0500
The following commit has been merged in the master branch:
commit 6b96a49eb6268adf9fc7e077fe849af7802a1575
Author: Andrew Deason <adeason@sinenomine.net>
Date: Wed Aug 26 13:54:00 2020 -0500
Retire AFS_MOUNT_AFS
Currently, the AFS_MOUNT_AFS #define is used to mean two completely
different things:
- The string "afs", corresponding to the first argument to mount(2) on
many platforms and some related calls inside libafs (e.g.
getnewvnode() on FBSD).
- An integer identifying the AFS filesystem (e.g. gfsadd() on AIX).
Depending on the platform and the build context (UKERNEL vs KERNEL),
AFS_MOUNT_AFS gets defined to one of those two things. This is very
confusing, and has led to mistakes in the past, such as those fixed in
commit 446457a1 (afs: Set AFS_VFSFSID to a numerical value).
To avoid such confusion, get rid of AFS_MOUNT_AFS completely, and
replace it with two new symbols:
- AFS_MOUNT_STR, the string "afs".
- AFS_FSNO, the integer given to gfsadd() et al.
When AFS_MOUNT_AFS is split this way, AFS_MOUNT_STR then is always
defined to the same value, so remove it from the param.h files for our
platforms. Instead, define it in afs.h for libafs use, and in
afsd_kernel.c (the only place outside of src/afs that uses it).
Also remove the logic for conditionally defining MOUNT_AFS from the
param.h files, moving the logic to the same locations as
AFS_MOUNT_STR.
Note that this commit removes the numeric definition for AFS_MOUNT_AFS
in param.sgi_65.h (aka AFS_FSNO). We never actually used this value,
since AFS_FSNO is not used on IRIX; instead, we tend to use the
'afs_fstype' global instead of a constant number.
Change-Id: I6cbf051dc938cd1c456cbe236c0afe99a3c3dd87
Reviewed-on: https://gerrit.openafs.org/14323
Reviewed-by: Cheyenne Wills <cwills@sinenomine.net>
Reviewed-by: Michael Meffie <mmeffie@sinenomine.net>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
src/afs/AIX/osi_config.c | 4 ++--
src/afs/AIX/osi_vnodeops.c | 2 +-
src/afs/IRIX/osi_vfsops.c | 2 +-
src/afs/NBSD/osi_vfsops.c | 4 ++--
src/afs/afs.h | 32 +++++++++++++++++++++-----------
src/afsd/afsd_kernel.c | 7 ++++---
src/config/param.alpha_nbsd15.h | 1 -
src/config/param.alpha_nbsd16.h | 1 -
src/config/param.arm_darwin_100.h | 6 ------
src/config/param.generic_fbsd.h | 6 ------
src/config/param.hp_ux102.h | 3 +--
src/config/param.hp_ux110.h | 3 +--
src/config/param.hp_ux11i.h | 3 +--
src/config/param.i386_dfbsd_23.h | 6 ------
src/config/param.i386_nbsd15.h | 1 -
src/config/param.i386_nbsd16.h | 1 -
src/config/param.linux26.h | 2 --
src/config/param.nbsd15.h | 5 -----
src/config/param.nbsd16.h | 5 -----
src/config/param.nbsd20.h | 5 -----
src/config/param.nbsd21.h | 5 -----
src/config/param.nbsd30.h | 5 -----
src/config/param.nbsd40.h | 1 -
src/config/param.nbsd50.h | 1 -
src/config/param.nbsd60.h | 1 -
src/config/param.nbsd70.h | 1 -
src/config/param.obsd31.h | 1 -
src/config/param.obsd32.h | 1 -
src/config/param.obsd33.h | 1 -
src/config/param.obsd34.h | 1 -
src/config/param.obsd35.h | 1 -
src/config/param.obsd36.h | 1 -
src/config/param.obsd37.h | 1 -
src/config/param.obsd38.h | 1 -
src/config/param.obsd39.h | 1 -
src/config/param.obsd40.h | 1 -
src/config/param.obsd41.h | 1 -
src/config/param.obsd42.h | 1 -
src/config/param.obsd43.h | 1 -
src/config/param.obsd44.h | 1 -
src/config/param.obsd45.h | 1 -
src/config/param.obsd46.h | 1 -
src/config/param.obsd47.h | 1 -
src/config/param.obsd48.h | 1 -
src/config/param.obsd49.h | 1 -
src/config/param.obsd50.h | 1 -
src/config/param.obsd51.h | 1 -
src/config/param.obsd52.h | 1 -
src/config/param.obsd53.h | 1 -
src/config/param.obsd54.h | 1 -
src/config/param.ppc_darwin_70.h | 6 ------
src/config/param.ppc_darwin_80.h | 6 ------
src/config/param.ppc_darwin_90.h | 6 ------
src/config/param.ppc_nbsd16.h | 1 -
src/config/param.rs_aix42.h | 6 ++----
src/config/param.rs_aix51.h | 6 ++----
src/config/param.rs_aix52.h | 6 ++----
src/config/param.rs_aix53.h | 6 ++----
src/config/param.rs_aix61.h | 6 ++----
src/config/param.sgi_65.h | 6 ------
src/config/param.sun4x_510.h | 6 +-----
src/config/param.sun4x_511.h | 6 +-----
src/config/param.sun4x_58.h | 6 +-----
src/config/param.sun4x_59.h | 6 +-----
src/config/param.sunx86_510.h | 6 +-----
src/config/param.sunx86_511.h | 6 +-----
src/config/param.sunx86_58.h | 6 +-----
src/config/param.sunx86_59.h | 6 +-----
src/config/param.x86_darwin_100.h | 6 ------
src/config/param.x86_darwin_110.h | 6 ------
src/config/param.x86_darwin_120.h | 6 ------
src/config/param.x86_darwin_130.h | 6 ------
src/config/param.x86_darwin_140.h | 6 ------
src/config/param.x86_darwin_150.h | 6 ------
src/config/param.x86_darwin_160.h | 6 ------
src/config/param.x86_darwin_170.h | 6 ------
src/config/param.x86_darwin_180.h | 6 ------
src/config/param.x86_darwin_190.h | 6 ------
src/config/param.x86_darwin_80.h | 6 ------
src/config/param.x86_darwin_90.h | 6 ------
80 files changed, 52 insertions(+), 260 deletions(-)
--
OpenAFS Master Repository