diff --git a/src/afs/AIX/osi_config.c b/src/afs/AIX/osi_config.c index 82fe533334..a6c18564e8 100644 --- a/src/afs/AIX/osi_config.c +++ b/src/afs/AIX/osi_config.c @@ -116,7 +116,7 @@ afs_config(cmd, uiop) */ if (err = pincode(afs_config)) goto out; - err = gfsadd(AFS_MOUNT_AFS, &afs_gfs); + err = gfsadd(AFS_FSNO, &afs_gfs); /* * ok, if already installed */ @@ -139,7 +139,7 @@ afs_config(cmd, uiop) koff_addsyms(db_syms, db_nsyms); } } else if (cmd == CFG_TERM) { /* delete AFS gfs */ - err = gfsdel(AFS_MOUNT_AFS); + err = gfsdel(AFS_FSNO); /* * ok, if already deleted */ diff --git a/src/afs/AIX/osi_vnodeops.c b/src/afs/AIX/osi_vnodeops.c index 1722d355e2..ab895b3f82 100644 --- a/src/afs/AIX/osi_vnodeops.c +++ b/src/afs/AIX/osi_vnodeops.c @@ -2580,7 +2580,7 @@ struct vnodeops locked_afs_gn_vnodeops = { struct gfs afs_gfs = { &locked_Afs_vfsops, &locked_afs_gn_vnodeops, - AFS_MOUNT_AFS, + AFS_FSNO, "afs", Afs_init, GFS_VERSION4 | GFS_VERSION42 | GFS_REMOTE, diff --git a/src/afs/IRIX/osi_vfsops.c b/src/afs/IRIX/osi_vfsops.c index 59fbd7cdf4..54362a1d5f 100644 --- a/src/afs/IRIX/osi_vfsops.c +++ b/src/afs/IRIX/osi_vfsops.c @@ -290,7 +290,7 @@ afs_statfs(OSI_VFS_ARG(afsp), abp, avp) abp->f_ffree = abp->f_favail = AFS_VFS_FAKEFREE; abp->f_fsid = AFS_VFSMAGIC; /* magic */ - strcpy(abp->f_basetype, AFS_MOUNT_AFS); + strcpy(abp->f_basetype, AFS_MOUNT_STR); abp->f_flag = 0; abp->f_namemax = 256; return 0; diff --git a/src/afs/NBSD/osi_vfsops.c b/src/afs/NBSD/osi_vfsops.c index a78943da03..7679ff1695 100644 --- a/src/afs/NBSD/osi_vfsops.c +++ b/src/afs/NBSD/osi_vfsops.c @@ -146,7 +146,7 @@ static const struct vnodeopv_desc *afs_vnodeopv_descs[] = { }; struct vfsops afs_vfsops = { - AFS_MOUNT_AFS, + AFS_MOUNT_STR, #ifdef AFS_NBSD50_ENV 0, /* vfs_min_mount_data */ #endif @@ -273,7 +273,7 @@ afs_mount(struct mount *mp, const char *path, void *data, memset(mp->mnt_stat.f_mntfromname, 0, MNAMELEN); strcpy(mp->mnt_stat.f_mntfromname, "AFS"); /* null terminated string "AFS" will fit, just leave it be. */ - strcpy(mp->mnt_stat.f_fstypename, AFS_MOUNT_AFS); + strcpy(mp->mnt_stat.f_fstypename, AFS_MOUNT_STR); AFS_GUNLOCK(); (void)afs_statvfs(mp, &mp->mnt_stat); diff --git a/src/afs/afs.h b/src/afs/afs.h index dae78037e3..7872412dff 100644 --- a/src/afs/afs.h +++ b/src/afs/afs.h @@ -34,24 +34,34 @@ enum afs_shutdown_state { }; extern enum afs_shutdown_state afs_shuttingdown; +/* + * The string that we use for the "device" we mount /afs on. That is, we're not + * mounted on a drive like /dev/sda, but instead mounted on "afs". + */ +#define AFS_MOUNT_STR "afs" +#ifndef MOUNT_AFS +# define MOUNT_AFS AFS_MOUNT_STR +#endif + /* * Macros to uniquely identify the AFS vfs struct */ #define AFS_VFSMAGIC 0x1234 -#if defined(UKERNEL) -# if defined(AFS_USR_AIX_ENV) || defined(AFS_USR_SGI_ENV) -# define AFS_VFSFSID AFS_MOUNT_AFS -# else -# define AFS_VFSFSID 99 -# endif -#elif defined(AFS_SUN5_ENV) || defined(AFS_HPUX90_ENV) || defined(AFS_LINUX_ENV) -# define AFS_VFSFSID 99 -#elif defined(AFS_SGI_ENV) -# define AFS_VFSFSID afs_fstype +/* + * Define AFS_VFSFSID, an id number corresponding to the AFS filesystem. On + * Irix, this is stored in a global var (afs_fstype); everywhere else, we have + * a constant. If we have a platform-defined value for this, use it (AFS_FSNO); + * otherwise, we just make up an arbitrary value here (99). + */ +#ifdef AFS_SGI_ENV +# define AFS_VFSFSID afs_fstype +#elif defined(AFS_FSNO) +# define AFS_VFSFSID AFS_FSNO #else -# define AFS_VFSFSID AFS_MOUNT_AFS +# define AFS_VFSFSID 99 #endif + /* use this value for reporting total space, free space, etc. * fake a high number to satisfy programs that use the statfs call to make sure * that there's enough space in the device partition before storing something diff --git a/src/afsd/afsd_kernel.c b/src/afsd/afsd_kernel.c index 9d9c6099fb..8fde8a1ceb 100644 --- a/src/afsd/afsd_kernel.c +++ b/src/afsd/afsd_kernel.c @@ -95,8 +95,9 @@ kern_return_t DiskArbDiskAppearedWithMountpointPing_auto(char *, unsigned int, #include #endif /* AFS_DARWIN_ENV */ +#define AFS_MOUNT_STR "afs" #ifndef MOUNT_AFS -#define MOUNT_AFS AFS_MOUNT_AFS +#define MOUNT_AFS AFS_MOUNT_STR #endif /* MOUNT_AFS */ #ifdef AFS_SGI_ENV @@ -315,11 +316,11 @@ aix_vmount(const char *cacheMountDir) vmountp->vmt_revision = VMT_REVISION; vmountp->vmt_length = size; vmountp->vmt_fsid.fsid_dev = 0; - vmountp->vmt_fsid.fsid_type = AFS_MOUNT_AFS; + vmountp->vmt_fsid.fsid_type = AFS_FSNO; vmountp->vmt_vfsnumber = 0; vmountp->vmt_time = 0; /* We'll put the time soon! */ vmountp->vmt_flags = VFS_DEVMOUNT; /* read/write permission */ - vmountp->vmt_gfstype = AFS_MOUNT_AFS; + vmountp->vmt_gfstype = AFS_FSNO; vmountdata(vmountp, "AFS", cacheMountDir, "", "", "", "rw"); /* Do the actual mount system call */ diff --git a/src/config/param.alpha_nbsd15.h b/src/config/param.alpha_nbsd15.h index bf17abb8d4..dd93021435 100644 --- a/src/config/param.alpha_nbsd15.h +++ b/src/config/param.alpha_nbsd15.h @@ -32,7 +32,6 @@ #define AFS_NONFSTRANS 1 #define AFS_KERBEROS_ENV -#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ #define AFS_SYSCALL 210 #define AFS_NAMEI_ENV 1 /* User space interface to file system */ #define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ diff --git a/src/config/param.alpha_nbsd16.h b/src/config/param.alpha_nbsd16.h index b73a6b2624..e6fa92ba2a 100644 --- a/src/config/param.alpha_nbsd16.h +++ b/src/config/param.alpha_nbsd16.h @@ -32,7 +32,6 @@ #define AFS_NONFSTRANS 1 #define AFS_KERBEROS_ENV -#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ #define AFS_SYSCALL 210 #define AFS_NAMEI_ENV 1 /* User space interface to file system */ #define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ diff --git a/src/config/param.arm_darwin_100.h b/src/config/param.arm_darwin_100.h index 2783416b48..f82af72523 100644 --- a/src/config/param.arm_darwin_100.h +++ b/src/config/param.arm_darwin_100.h @@ -37,9 +37,6 @@ #define AFS_CACHE_VNODE_PATH #define NEED_IOCTL32 -/* File system entry (used if mount.h doesn't define MOUNT_AFS */ -#define AFS_MOUNT_AFS "afs" - /* Machine / Operating system information */ #if defined(__ppc__) #define sys_ppc_darwin_12 1 @@ -185,9 +182,6 @@ struct rt_addrinfo { #define DARWIN_REFBASE 0 #define AFS_WARNUSER_MARINER_ENV 1 -/* File system entry (used if mount.h doesn't define MOUNT_AFS */ -#define AFS_MOUNT_AFS "afs" - /* Machine / Operating system information */ #if defined(__ppc__) #define sys_ppc_darwin_12 1 diff --git a/src/config/param.generic_fbsd.h b/src/config/param.generic_fbsd.h index 94ec0683b2..e09158b952 100644 --- a/src/config/param.generic_fbsd.h +++ b/src/config/param.generic_fbsd.h @@ -42,16 +42,11 @@ #define AFS_ENV 1 #define AFS_SYSCALL 339 -#define AFS_MOUNT_AFS "afs" #ifndef MOUNT_UFS #define MOUNT_UFS "ufs" #endif -#ifndef MOUNT_AFS -#define MOUNT_AFS AFS_MOUNT_AFS -#endif - #define RXK_LISTENER_ENV 1 #define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ #define AFS_USE_GETTIMEOFDAY 1 /* use gettimeofday to implement rx clock */ @@ -154,7 +149,6 @@ enum vcexcl { NONEXCL, EXCL }; #undef AFS_NONFSTRANS #define AFS_NONFSTRANS 1 -#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ #define AFS_SYSCALL 339 #define AFS_NAMEI_ENV 1 /* User space interface to file system */ #define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ diff --git a/src/config/param.hp_ux102.h b/src/config/param.hp_ux102.h index 93fd121d57..90eedaf8aa 100644 --- a/src/config/param.hp_ux102.h +++ b/src/config/param.hp_ux102.h @@ -125,8 +125,7 @@ struct uio; #define AFS_SYSCALL 48 /* slot reserved for AFS */ -/* File system entry (used if mount.h doesn't define MOUNT_AFS */ -#define AFS_MOUNT_AFS 1 +#define AFS_FSNO 1 /* Machine / Operating system information */ #define SYS_NAME "hp_ux102" diff --git a/src/config/param.hp_ux110.h b/src/config/param.hp_ux110.h index ca541f955a..4d7e99b245 100644 --- a/src/config/param.hp_ux110.h +++ b/src/config/param.hp_ux110.h @@ -130,8 +130,7 @@ struct uio; #define AFS_SYSCALL 48 /* slot reserved for AFS */ -/* File system entry (used if mount.h doesn't define MOUNT_AFS */ -#define AFS_MOUNT_AFS 1 +#define AFS_FSNO 1 /* Machine / Operating system information */ #define SYS_NAME "hp_ux110" diff --git a/src/config/param.hp_ux11i.h b/src/config/param.hp_ux11i.h index 9a76aec1ef..513bc7fc49 100644 --- a/src/config/param.hp_ux11i.h +++ b/src/config/param.hp_ux11i.h @@ -134,8 +134,7 @@ struct uio; #define AFS_SYSCALL 48 /* slot reserved for AFS */ -/* File system entry (used if mount.h doesn't define MOUNT_AFS */ -#define AFS_MOUNT_AFS 1 +#define AFS_FSNO 1 /* Machine / Operating system information */ #define SYS_NAME "hp_ux110" diff --git a/src/config/param.i386_dfbsd_23.h b/src/config/param.i386_dfbsd_23.h index 0887819901..46b5aaf4b7 100644 --- a/src/config/param.i386_dfbsd_23.h +++ b/src/config/param.i386_dfbsd_23.h @@ -53,16 +53,11 @@ #define AFS_ENV 1 #define AFS_SYSCALL 339 -#define AFS_MOUNT_AFS "afs" #ifndef MOUNT_UFS #define MOUNT_UFS "ufs" #endif -#ifndef MOUNT_AFS -#define MOUNT_AFS AFS_MOUNT_AFS -#endif - #define RXK_LISTENER_ENV 1 #define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ #define AFS_USE_GETTIMEOFDAY 1 /* use gettimeofday to implement rx clock */ @@ -131,7 +126,6 @@ enum vcexcl { NONEXCL, EXCL }; #undef AFS_NONFSTRANS #define AFS_NONFSTRANS 1 -#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ #define AFS_SYSCALL 339 #define AFS_NAMEI_ENV 1 /* User space interface to file system */ #define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ diff --git a/src/config/param.i386_nbsd15.h b/src/config/param.i386_nbsd15.h index 206241965d..4df26f4476 100644 --- a/src/config/param.i386_nbsd15.h +++ b/src/config/param.i386_nbsd15.h @@ -34,7 +34,6 @@ #define AFS_NONFSTRANS 1 #define AFS_KERBEROS_ENV -#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ #define AFS_SYSCALL 210 #define AFS_NAMEI_ENV 1 /* User space interface to file system */ #define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ diff --git a/src/config/param.i386_nbsd16.h b/src/config/param.i386_nbsd16.h index 261224393e..9ff7c69359 100644 --- a/src/config/param.i386_nbsd16.h +++ b/src/config/param.i386_nbsd16.h @@ -36,7 +36,6 @@ #define AFS_NONFSTRANS 1 #define AFS_KERBEROS_ENV -#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ #define AFS_SYSCALL 210 #define AFS_NAMEI_ENV 1 /* User space interface to file system */ #define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ diff --git a/src/config/param.linux26.h b/src/config/param.linux26.h index 13838520bc..8fa1e3cb92 100644 --- a/src/config/param.linux26.h +++ b/src/config/param.linux26.h @@ -17,7 +17,6 @@ #define AFS_LINUX_ENV 1 -#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type */ #define AFS_64BIT_IOPS_ENV 1 #define AFS_NAMEI_ENV 1 /* User space interface to file system */ #define AFS_64BIT_CLIENT 1 @@ -68,7 +67,6 @@ #define AFS_64BIT_CLIENT 1 #undef AFS_NONFSTRANS #define AFS_NONFSTRANS 1 -#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ #define AFS_64BIT_IOPS_ENV 1 #define AFS_NAMEI_ENV 1 /* User space interface to file system */ #define AFS_USERSPACE_IP_ADDR 1 diff --git a/src/config/param.nbsd15.h b/src/config/param.nbsd15.h index 9714ee6097..771ace0467 100644 --- a/src/config/param.nbsd15.h +++ b/src/config/param.nbsd15.h @@ -37,7 +37,6 @@ #define AFS_GREEDY43_ENV 1 #define AFS_ENV 1 -#define AFS_MOUNT_AFS "afs" #define AFS_SYSCALL 210 @@ -45,10 +44,6 @@ #define MOUNT_UFS "ufs" #endif -#ifndef MOUNT_AFS -#define MOUNT_AFS AFS_MOUNT_AFS -#endif - #define AFS_HAVE_FFS 1 /* Use system's ffs. */ #define AFS_HAVE_STATVFS 0 /* System doesn't supports statvfs */ diff --git a/src/config/param.nbsd16.h b/src/config/param.nbsd16.h index 6694be28a1..1630fdf20c 100644 --- a/src/config/param.nbsd16.h +++ b/src/config/param.nbsd16.h @@ -38,7 +38,6 @@ #define AFS_GREEDY43_ENV 1 #define AFS_ENV 1 -#define AFS_MOUNT_AFS "afs" #define AFS_SYSCALL 210 @@ -46,10 +45,6 @@ #define MOUNT_UFS "ufs" #endif -#ifndef MOUNT_AFS -#define MOUNT_AFS AFS_MOUNT_AFS -#endif - #define AFS_HAVE_FFS 1 /* Use system's ffs. */ #define AFS_HAVE_STATVFS 0 /* System doesn't supports statvfs */ diff --git a/src/config/param.nbsd20.h b/src/config/param.nbsd20.h index c294b77b2a..140e971642 100644 --- a/src/config/param.nbsd20.h +++ b/src/config/param.nbsd20.h @@ -7,13 +7,8 @@ #define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ #define AFS_64BIT_CLIENT 1 -#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ #define AFS_SYSCALL 210 -#ifndef MOUNT_AFS -#define MOUNT_AFS AFS_MOUNT_AFS -#endif - #define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */ #define AFS_NBSD_ENV 1 diff --git a/src/config/param.nbsd21.h b/src/config/param.nbsd21.h index 7de8d329a0..9402be5bb1 100644 --- a/src/config/param.nbsd21.h +++ b/src/config/param.nbsd21.h @@ -7,13 +7,8 @@ #define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ #define AFS_64BIT_CLIENT 1 -#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ #define AFS_SYSCALL 210 -#ifndef MOUNT_AFS -#define MOUNT_AFS AFS_MOUNT_AFS -#endif - #define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */ #define AFS_NBSD_ENV 1 diff --git a/src/config/param.nbsd30.h b/src/config/param.nbsd30.h index 2c67a8ff9b..96e4a73957 100644 --- a/src/config/param.nbsd30.h +++ b/src/config/param.nbsd30.h @@ -7,13 +7,8 @@ #define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ #define AFS_64BIT_CLIENT 1 -#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ #define AFS_SYSCALL 210 -#ifndef MOUNT_AFS -#define MOUNT_AFS AFS_MOUNT_AFS -#endif - #define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */ #define AFS_NBSD_ENV 1 diff --git a/src/config/param.nbsd40.h b/src/config/param.nbsd40.h index 0761607076..7e3a92101f 100644 --- a/src/config/param.nbsd40.h +++ b/src/config/param.nbsd40.h @@ -7,7 +7,6 @@ #define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ #define AFS_64BIT_CLIENT 1 -#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ #define AFS_SYSCALL 318 /* 210 */ #define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */ diff --git a/src/config/param.nbsd50.h b/src/config/param.nbsd50.h index 0be55a1842..fcb2077caa 100644 --- a/src/config/param.nbsd50.h +++ b/src/config/param.nbsd50.h @@ -7,7 +7,6 @@ #define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ #define AFS_64BIT_CLIENT 1 -#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ #define AFS_SYSCALL 210 #define AFS_KALLOC(n) kmem_alloc(n, KM_SLEEP) diff --git a/src/config/param.nbsd60.h b/src/config/param.nbsd60.h index f6a1aef6e6..dda79311ec 100644 --- a/src/config/param.nbsd60.h +++ b/src/config/param.nbsd60.h @@ -7,7 +7,6 @@ #define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ #define AFS_64BIT_CLIENT 1 -#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ #define AFS_SYSCALL 210 #define AFS_KALLOC(n) kmem_alloc(n, KM_SLEEP) diff --git a/src/config/param.nbsd70.h b/src/config/param.nbsd70.h index ac5b98d396..bb7534fb36 100644 --- a/src/config/param.nbsd70.h +++ b/src/config/param.nbsd70.h @@ -7,7 +7,6 @@ #define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ #define AFS_64BIT_CLIENT 1 -#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ #define AFS_SYSCALL 210 #define AFS_KALLOC(n) kmem_alloc(n, KM_SLEEP) diff --git a/src/config/param.obsd31.h b/src/config/param.obsd31.h index a660e98fd6..edf9a73a43 100644 --- a/src/config/param.obsd31.h +++ b/src/config/param.obsd31.h @@ -29,7 +29,6 @@ #define FTRUNC O_TRUNC #define AFS_SYSCALL 208 -#define AFS_MOUNT_AFS "afs" #define RXK_LISTENER_ENV 1 #define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ diff --git a/src/config/param.obsd32.h b/src/config/param.obsd32.h index 0abbf7d083..3472178ef9 100644 --- a/src/config/param.obsd32.h +++ b/src/config/param.obsd32.h @@ -28,7 +28,6 @@ #define FTRUNC O_TRUNC #define AFS_SYSCALL 208 -#define AFS_MOUNT_AFS "afs" #define RXK_LISTENER_ENV 1 #define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ diff --git a/src/config/param.obsd33.h b/src/config/param.obsd33.h index 80119092a9..a82cb43022 100644 --- a/src/config/param.obsd33.h +++ b/src/config/param.obsd33.h @@ -29,7 +29,6 @@ #define FTRUNC O_TRUNC #define AFS_SYSCALL 208 -#define AFS_MOUNT_AFS "afs" #define RXK_LISTENER_ENV 1 #define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ diff --git a/src/config/param.obsd34.h b/src/config/param.obsd34.h index 177b331e4d..62e6062142 100644 --- a/src/config/param.obsd34.h +++ b/src/config/param.obsd34.h @@ -30,7 +30,6 @@ #define FTRUNC O_TRUNC #define AFS_SYSCALL 208 -#define AFS_MOUNT_AFS "afs" #define RXK_LISTENER_ENV 1 #define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ diff --git a/src/config/param.obsd35.h b/src/config/param.obsd35.h index c67ef63e06..f03dce86d6 100644 --- a/src/config/param.obsd35.h +++ b/src/config/param.obsd35.h @@ -30,7 +30,6 @@ #define FTRUNC O_TRUNC #define AFS_SYSCALL 208 -#define AFS_MOUNT_AFS "afs" #define RXK_LISTENER_ENV 1 #define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ diff --git a/src/config/param.obsd36.h b/src/config/param.obsd36.h index 2f0ebd079a..0ee70960ff 100644 --- a/src/config/param.obsd36.h +++ b/src/config/param.obsd36.h @@ -32,7 +32,6 @@ #define FTRUNC O_TRUNC #define AFS_SYSCALL 208 -#define AFS_MOUNT_AFS "afs" #define RXK_LISTENER_ENV 1 #define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ diff --git a/src/config/param.obsd37.h b/src/config/param.obsd37.h index 401cfa841f..fc26d85f11 100644 --- a/src/config/param.obsd37.h +++ b/src/config/param.obsd37.h @@ -33,7 +33,6 @@ #define FTRUNC O_TRUNC #define AFS_SYSCALL 208 -#define AFS_MOUNT_AFS "afs" #define RXK_LISTENER_ENV 1 #define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ diff --git a/src/config/param.obsd38.h b/src/config/param.obsd38.h index 2eb5f29318..6fa98fed62 100644 --- a/src/config/param.obsd38.h +++ b/src/config/param.obsd38.h @@ -34,7 +34,6 @@ #define FTRUNC O_TRUNC #define AFS_SYSCALL 208 -#define AFS_MOUNT_AFS "afs" #define RXK_LISTENER_ENV 1 #define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ diff --git a/src/config/param.obsd39.h b/src/config/param.obsd39.h index 2d3d9a3646..61626f94e1 100644 --- a/src/config/param.obsd39.h +++ b/src/config/param.obsd39.h @@ -38,7 +38,6 @@ #define FTRUNC O_TRUNC #define AFS_SYSCALL 208 -#define AFS_MOUNT_AFS "afs" #define RXK_LISTENER_ENV 1 #define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ diff --git a/src/config/param.obsd40.h b/src/config/param.obsd40.h index 6f6c0608b5..23df49de3c 100644 --- a/src/config/param.obsd40.h +++ b/src/config/param.obsd40.h @@ -36,7 +36,6 @@ #define FTRUNC O_TRUNC #define AFS_SYSCALL 208 -#define AFS_MOUNT_AFS "afs" #define RXK_LISTENER_ENV 1 #define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ diff --git a/src/config/param.obsd41.h b/src/config/param.obsd41.h index 7c4453b362..e102260d6a 100644 --- a/src/config/param.obsd41.h +++ b/src/config/param.obsd41.h @@ -37,7 +37,6 @@ #define FTRUNC O_TRUNC #define AFS_SYSCALL 208 -#define AFS_MOUNT_AFS "afs" #define RXK_LISTENER_ENV 1 #define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ diff --git a/src/config/param.obsd42.h b/src/config/param.obsd42.h index a8b5edd0c5..b3f821bb9e 100644 --- a/src/config/param.obsd42.h +++ b/src/config/param.obsd42.h @@ -38,7 +38,6 @@ #define FTRUNC O_TRUNC #define AFS_SYSCALL 208 -#define AFS_MOUNT_AFS "afs" #define RXK_LISTENER_ENV 1 #define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ diff --git a/src/config/param.obsd43.h b/src/config/param.obsd43.h index 9be4abdb24..6dd7baa7a5 100644 --- a/src/config/param.obsd43.h +++ b/src/config/param.obsd43.h @@ -39,7 +39,6 @@ #define FTRUNC O_TRUNC #define AFS_SYSCALL 208 -#define AFS_MOUNT_AFS "afs" #define RXK_LISTENER_ENV 1 #define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ diff --git a/src/config/param.obsd44.h b/src/config/param.obsd44.h index 26bdc07b33..624795d382 100644 --- a/src/config/param.obsd44.h +++ b/src/config/param.obsd44.h @@ -40,7 +40,6 @@ #define FTRUNC O_TRUNC #define AFS_SYSCALL 208 -#define AFS_MOUNT_AFS "afs" #define RXK_LISTENER_ENV 1 #define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ diff --git a/src/config/param.obsd45.h b/src/config/param.obsd45.h index ed8a99604a..aab537e7c3 100644 --- a/src/config/param.obsd45.h +++ b/src/config/param.obsd45.h @@ -40,7 +40,6 @@ #define FTRUNC O_TRUNC #define AFS_SYSCALL 208 -#define AFS_MOUNT_AFS "afs" #define RXK_LISTENER_ENV 1 #define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ diff --git a/src/config/param.obsd46.h b/src/config/param.obsd46.h index 4157780cee..ef123d7f7e 100644 --- a/src/config/param.obsd46.h +++ b/src/config/param.obsd46.h @@ -41,7 +41,6 @@ #define FTRUNC O_TRUNC #define AFS_SYSCALL 208 -#define AFS_MOUNT_AFS "afs" #define RXK_LISTENER_ENV 1 #define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ diff --git a/src/config/param.obsd47.h b/src/config/param.obsd47.h index 5561406904..beabaa2933 100644 --- a/src/config/param.obsd47.h +++ b/src/config/param.obsd47.h @@ -42,7 +42,6 @@ #define FTRUNC O_TRUNC #define AFS_SYSCALL 208 -#define AFS_MOUNT_AFS "afs" #define RXK_LISTENER_ENV 1 #define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ diff --git a/src/config/param.obsd48.h b/src/config/param.obsd48.h index 6c4462083c..d87d53d28d 100644 --- a/src/config/param.obsd48.h +++ b/src/config/param.obsd48.h @@ -43,7 +43,6 @@ #define FTRUNC O_TRUNC #define AFS_SYSCALL 208 -#define AFS_MOUNT_AFS "afs" #define RXK_LISTENER_ENV 1 #define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ diff --git a/src/config/param.obsd49.h b/src/config/param.obsd49.h index 7adf325d34..28e3838908 100644 --- a/src/config/param.obsd49.h +++ b/src/config/param.obsd49.h @@ -44,7 +44,6 @@ #define FTRUNC O_TRUNC #define AFS_SYSCALL 208 -#define AFS_MOUNT_AFS "afs" #define RXK_LISTENER_ENV 1 #define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ diff --git a/src/config/param.obsd50.h b/src/config/param.obsd50.h index 06d1990e49..effaccdd1d 100644 --- a/src/config/param.obsd50.h +++ b/src/config/param.obsd50.h @@ -45,7 +45,6 @@ #define FTRUNC O_TRUNC #define AFS_SYSCALL 208 -#define AFS_MOUNT_AFS "afs" #define RXK_LISTENER_ENV 1 #define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ diff --git a/src/config/param.obsd51.h b/src/config/param.obsd51.h index 8c7756a174..49b5c33049 100644 --- a/src/config/param.obsd51.h +++ b/src/config/param.obsd51.h @@ -46,7 +46,6 @@ #define FTRUNC O_TRUNC #define AFS_SYSCALL 208 -#define AFS_MOUNT_AFS "afs" #define RXK_LISTENER_ENV 1 #define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ diff --git a/src/config/param.obsd52.h b/src/config/param.obsd52.h index 4d27576850..9cfa12c5a9 100644 --- a/src/config/param.obsd52.h +++ b/src/config/param.obsd52.h @@ -47,7 +47,6 @@ #define FTRUNC O_TRUNC #define AFS_SYSCALL 208 -#define AFS_MOUNT_AFS "afs" #define RXK_LISTENER_ENV 1 #define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ diff --git a/src/config/param.obsd53.h b/src/config/param.obsd53.h index 58b4282c3e..d140dc0667 100644 --- a/src/config/param.obsd53.h +++ b/src/config/param.obsd53.h @@ -48,7 +48,6 @@ #define FTRUNC O_TRUNC #define AFS_SYSCALL 208 -#define AFS_MOUNT_AFS "afs" #define RXK_LISTENER_ENV 1 #define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ diff --git a/src/config/param.obsd54.h b/src/config/param.obsd54.h index 45d0cc1923..797ca45a38 100644 --- a/src/config/param.obsd54.h +++ b/src/config/param.obsd54.h @@ -49,7 +49,6 @@ #define FTRUNC O_TRUNC #define AFS_SYSCALL 208 -#define AFS_MOUNT_AFS "afs" #define RXK_LISTENER_ENV 1 #define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ diff --git a/src/config/param.ppc_darwin_70.h b/src/config/param.ppc_darwin_70.h index 7a71a32c5d..ff9012042b 100644 --- a/src/config/param.ppc_darwin_70.h +++ b/src/config/param.ppc_darwin_70.h @@ -19,9 +19,6 @@ #define AFS_NAMEI_ENV 1 #define DARWIN_REFBASE 3 -/* File system entry (used if mount.h doesn't define MOUNT_AFS */ -#define AFS_MOUNT_AFS "afs" - /* Machine / Operating system information */ #define sys_ppc_darwin_12 1 #define sys_ppc_darwin_13 1 @@ -89,9 +86,6 @@ #define AFS_SYSCALL 230 #define DARWIN_REFBASE 0 -/* File system entry (used if mount.h doesn't define MOUNT_AFS */ -#define AFS_MOUNT_AFS "afs" - /* Machine / Operating system information */ #define sys_ppc_darwin_12 1 #define sys_ppc_darwin_13 1 diff --git a/src/config/param.ppc_darwin_80.h b/src/config/param.ppc_darwin_80.h index 7b4a4d1f93..8aac55be64 100644 --- a/src/config/param.ppc_darwin_80.h +++ b/src/config/param.ppc_darwin_80.h @@ -28,9 +28,6 @@ #define DARWIN_REFBASE 3 #define AFS_WARNUSER_MARINER_ENV 1 -/* File system entry (used if mount.h doesn't define MOUNT_AFS */ -#define AFS_MOUNT_AFS "afs" - /* Machine / Operating system information */ #if defined(__ppc__) #define sys_ppc_darwin_12 1 @@ -118,9 +115,6 @@ #define DARWIN_REFBASE 0 #define AFS_WARNUSER_MARINER_ENV 1 -/* File system entry (used if mount.h doesn't define MOUNT_AFS */ -#define AFS_MOUNT_AFS "afs" - /* Machine / Operating system information */ #if defined(__ppc__) #define sys_ppc_darwin_12 1 diff --git a/src/config/param.ppc_darwin_90.h b/src/config/param.ppc_darwin_90.h index bce4212c2f..88c0bdbb4c 100644 --- a/src/config/param.ppc_darwin_90.h +++ b/src/config/param.ppc_darwin_90.h @@ -31,9 +31,6 @@ #define AFS_CACHE_VNODE_PATH #define AFS_NEW_BKG 1 -/* File system entry (used if mount.h doesn't define MOUNT_AFS */ -#define AFS_MOUNT_AFS "afs" - /* Machine / Operating system information */ #if defined(__ppc__) #define sys_ppc_darwin_12 1 @@ -122,9 +119,6 @@ #define DARWIN_REFBASE 0 #define AFS_WARNUSER_MARINER_ENV 1 -/* File system entry (used if mount.h doesn't define MOUNT_AFS */ -#define AFS_MOUNT_AFS "afs" - /* Machine / Operating system information */ #if defined(__ppc__) #define sys_ppc_darwin_12 1 diff --git a/src/config/param.ppc_nbsd16.h b/src/config/param.ppc_nbsd16.h index e4a90694dd..515b0e4a57 100644 --- a/src/config/param.ppc_nbsd16.h +++ b/src/config/param.ppc_nbsd16.h @@ -31,7 +31,6 @@ #define AFS_NONFSTRANS 1 #define AFS_KERBEROS_ENV -#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ #define AFS_SYSCALL 210 #define AFS_NAMEI_ENV 1 /* User space interface to file system */ #define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ diff --git a/src/config/param.rs_aix42.h b/src/config/param.rs_aix42.h index dc38566aae..e204b31247 100644 --- a/src/config/param.rs_aix42.h +++ b/src/config/param.rs_aix42.h @@ -32,8 +32,7 @@ #define AFS_GLOBAL_SUNLOCK 1 #define AFS_GCPAGS 1 /* if nonzero, garbage collect PAGs */ -/* File system entry (used if vmount.h doesn't define MNT_AFS */ -#define AFS_MOUNT_AFS 4 +#define AFS_FSNO 4 #define AFS_SYSCALL 31 /* Machine / Operating system information */ @@ -127,8 +126,7 @@ #define AFS_3DISPARES 1 /* Utilize the 3 available disk inode 'spares' */ #define AFS_SYSCALL 105 -/* File system entry (used if mount.h doesn't define MOUNT_AFS */ -#define AFS_MOUNT_AFS 4 +#define AFS_FSNO 4 /* Machine / Operating system information */ #define sys_rs_aix42 1 diff --git a/src/config/param.rs_aix51.h b/src/config/param.rs_aix51.h index 08304c9eb8..4a31139b6e 100644 --- a/src/config/param.rs_aix51.h +++ b/src/config/param.rs_aix51.h @@ -33,8 +33,7 @@ #define AFS_GLOBAL_SUNLOCK 1 #define AFS_GCPAGS 1 /* if nonzero, garbage collect PAGs */ -/* File system entry (used if vmount.h doesn't define MNT_AFS */ -#define AFS_MOUNT_AFS 4 +#define AFS_FSNO 4 #define AFS_SYSCALL 31 /* Machine / Operating system information */ @@ -134,8 +133,7 @@ #define AFS_3DISPARES 1 /* Utilize the 3 available disk inode 'spares' */ #define AFS_SYSCALL 105 -/* File system entry (used if mount.h doesn't define MOUNT_AFS */ -#define AFS_MOUNT_AFS 4 +#define AFS_FSNO 4 /* Machine / Operating system information */ #define sys_rs_aix51 1 diff --git a/src/config/param.rs_aix52.h b/src/config/param.rs_aix52.h index 4a6487973c..278f3ffc60 100644 --- a/src/config/param.rs_aix52.h +++ b/src/config/param.rs_aix52.h @@ -34,8 +34,7 @@ #define AFS_GLOBAL_SUNLOCK 1 #define AFS_GCPAGS 1 /* if nonzero, garbage collect PAGs */ -/* File system entry (used if vmount.h doesn't define MNT_AFS */ -#define AFS_MOUNT_AFS 4 +#define AFS_FSNO 4 #define AFS_SYSCALL 31 /* Machine / Operating system information */ @@ -135,8 +134,7 @@ #define AFS_3DISPARES 1 /* Utilize the 3 available disk inode 'spares' */ #define AFS_SYSCALL 105 -/* File system entry (used if mount.h doesn't define MOUNT_AFS */ -#define AFS_MOUNT_AFS 4 +#define AFS_FSNO 4 /* Machine / Operating system information */ #define sys_rs_aix51 1 diff --git a/src/config/param.rs_aix53.h b/src/config/param.rs_aix53.h index 382af535e9..9401f24918 100644 --- a/src/config/param.rs_aix53.h +++ b/src/config/param.rs_aix53.h @@ -35,8 +35,7 @@ #define AFS_GLOBAL_SUNLOCK 1 #define AFS_GCPAGS 1 /* if nonzero, garbage collect PAGs */ -/* File system entry (used if vmount.h doesn't define MNT_AFS */ -#define AFS_MOUNT_AFS 4 +#define AFS_FSNO 4 #define AFS_SYSCALL 31 /* Machine / Operating system information */ @@ -136,8 +135,7 @@ #define AFS_3DISPARES 1 /* Utilize the 3 available disk inode 'spares' */ #define AFS_SYSCALL 105 -/* File system entry (used if mount.h doesn't define MOUNT_AFS */ -#define AFS_MOUNT_AFS 4 +#define AFS_FSNO 4 /* Machine / Operating system information */ #define sys_rs_aix51 1 diff --git a/src/config/param.rs_aix61.h b/src/config/param.rs_aix61.h index 868fe9f3d0..eb5a75e954 100644 --- a/src/config/param.rs_aix61.h +++ b/src/config/param.rs_aix61.h @@ -36,8 +36,7 @@ #define AFS_GLOBAL_SUNLOCK 1 #define AFS_GCPAGS 1 /* if nonzero, garbage collect PAGs */ -/* File system entry (used if vmount.h doesn't define MNT_AFS */ -#define AFS_MOUNT_AFS 4 +#define AFS_FSNO 4 #define AFS_SYSCALL 31 /* Machine / Operating system information */ @@ -137,8 +136,7 @@ #define AFS_3DISPARES 1 /* Utilize the 3 available disk inode 'spares' */ #define AFS_SYSCALL 105 -/* File system entry (used if mount.h doesn't define MOUNT_AFS */ -#define AFS_MOUNT_AFS 4 +#define AFS_FSNO 4 /* Machine / Operating system information */ #define sys_rs_aix51 1 diff --git a/src/config/param.sgi_65.h b/src/config/param.sgi_65.h index a7dbdb80e6..517c33b1d4 100644 --- a/src/config/param.sgi_65.h +++ b/src/config/param.sgi_65.h @@ -55,9 +55,6 @@ #define AFS_SGI_XFS_IOPS_ENV 1 /* turns on XFS inode ops. */ #define AFS_64BIT_IOPS_ENV 1 /* inode ops expect 64 bit inodes */ -/* File system entry (used if mount.h doesn't define MOUNT_AFS */ -#define AFS_MOUNT_AFS "afs" - /* Machine / Operating system information */ #define sys_sgi_65 1 #define SYS_NAME "sgi_65" @@ -140,9 +137,6 @@ #define AFS_PIOCTL 64+1000 #define AFS_SYSCALL 73+1000 -/* File system entry (used if mount.h doesn't define MOUNT_AFS */ -#define AFS_MOUNT_AFS 1 - /* Machine / Operating system information */ #define sgi_65 1 #define SYS_NAME "sgi_65" diff --git a/src/config/param.sun4x_510.h b/src/config/param.sun4x_510.h index 803ea2a512..13a97f08bb 100644 --- a/src/config/param.sun4x_510.h +++ b/src/config/param.sun4x_510.h @@ -35,9 +35,6 @@ #define AFS_SYSCALL 65 -/* File system entry (used if mount.h doesn't define MOUNT_AFS */ -#define AFS_MOUNT_AFS "afs" - /* Machine / Operating system information */ #define sys_sun4x_510 1 #define SYS_NAME "sun4x_510" @@ -124,8 +121,7 @@ #define AFS_3DISPARES 1 /* Utilize the 3 available disk inode 'spares' */ #define AFS_SYSCALL 65 -/* File system entry (used if mount.h doesn't define MOUNT_AFS */ -#define AFS_MOUNT_AFS 1 +#define AFS_FSNO 1 /* Machine / Operating system information */ #define sys_sun4x_59 1 diff --git a/src/config/param.sun4x_511.h b/src/config/param.sun4x_511.h index a6891bb9af..287239950e 100644 --- a/src/config/param.sun4x_511.h +++ b/src/config/param.sun4x_511.h @@ -38,9 +38,6 @@ #define AFS_GCPAGS 1 /* if nonzero, garbage collect PAGs */ #define AFS_PAG_ONEGROUP_ENV 1 /* Use a single gid to indicate a PAG */ -/* File system entry (used if mount.h doesn't define MOUNT_AFS */ -#define AFS_MOUNT_AFS "afs" - /* Machine / Operating system information */ #define sys_sun4x_511 1 #define SYS_NAME "sun4x_511" @@ -130,8 +127,7 @@ /* so we get _IOW() when we include sys/ioctl.h */ #define BSD_COMP -/* File system entry (used if mount.h doesn't define MOUNT_AFS */ -#define AFS_MOUNT_AFS 1 +#define AFS_FSNO 1 /* Machine / Operating system information */ #define sys_sun4x_511 1 diff --git a/src/config/param.sun4x_58.h b/src/config/param.sun4x_58.h index df290549c9..280a1b6ab8 100644 --- a/src/config/param.sun4x_58.h +++ b/src/config/param.sun4x_58.h @@ -31,9 +31,6 @@ #define AFS_SYSCALL 65 -/* File system entry (used if mount.h doesn't define MOUNT_AFS */ -#define AFS_MOUNT_AFS "afs" - /* Machine / Operating system information */ #define sys_sun4x_58 1 #define SYS_NAME "sun4x_58" @@ -122,8 +119,7 @@ #define AFS_3DISPARES 1 /* Utilize the 3 available disk inode 'spares' */ #define AFS_SYSCALL 65 -/* File system entry (used if mount.h doesn't define MOUNT_AFS */ -#define AFS_MOUNT_AFS 1 +#define AFS_FSNO 1 /* Machine / Operating system information */ #define sys_sun4x_58 1 diff --git a/src/config/param.sun4x_59.h b/src/config/param.sun4x_59.h index 6ee6d6b1ca..a6550654dc 100644 --- a/src/config/param.sun4x_59.h +++ b/src/config/param.sun4x_59.h @@ -32,9 +32,6 @@ #define AFS_SYSCALL 65 -/* File system entry (used if mount.h doesn't define MOUNT_AFS */ -#define AFS_MOUNT_AFS "afs" - /* Machine / Operating system information */ #define sys_sun4x_59 1 #define SYS_NAME "sun4x_59" @@ -124,8 +121,7 @@ #define AFS_3DISPARES 1 /* Utilize the 3 available disk inode 'spares' */ #define AFS_SYSCALL 65 -/* File system entry (used if mount.h doesn't define MOUNT_AFS */ -#define AFS_MOUNT_AFS 1 +#define AFS_FSNO 1 /* Machine / Operating system information */ #define sys_sun4x_59 1 diff --git a/src/config/param.sunx86_510.h b/src/config/param.sunx86_510.h index 371e5eec37..ca8ddda4aa 100644 --- a/src/config/param.sunx86_510.h +++ b/src/config/param.sunx86_510.h @@ -45,9 +45,6 @@ #define AFS_SYSCALL 65 -/* File system entry (used if mount.h doesn't define MOUNT_AFS */ -#define AFS_MOUNT_AFS "afs" - /* Machine / Operating system information */ #define sys_sunx86_510 1 #define SYS_NAME "sunx86_510" @@ -134,8 +131,7 @@ #define AFS_3DISPARES 1 /* Utilize the 3 available disk inode 'spares' */ #define AFS_SYSCALL 65 -/* File system entry (used if mount.h doesn't define MOUNT_AFS */ -#define AFS_MOUNT_AFS 1 +#define AFS_FSNO 1 /* Machine / Operating system information */ #define sys_sunx86_510 1 diff --git a/src/config/param.sunx86_511.h b/src/config/param.sunx86_511.h index b20c0d0eee..9e14567f4c 100644 --- a/src/config/param.sunx86_511.h +++ b/src/config/param.sunx86_511.h @@ -48,9 +48,6 @@ /* so we get _IOW() when we include sys/ioctl.h */ #define BSD_COMP -/* File system entry (used if mount.h doesn't define MOUNT_AFS */ -#define AFS_MOUNT_AFS "afs" - /* Machine / Operating system information */ #define sys_sunx86_511 1 #define SYS_NAME "sunx86_511" @@ -139,8 +136,7 @@ /* so we get _IOW() when we include sys/ioctl.h */ #define BSD_COMP -/* File system entry (used if mount.h doesn't define MOUNT_AFS */ -#define AFS_MOUNT_AFS 1 +#define AFS_FSNO 1 /* Machine / Operating system information */ #define sys_sunx86_511 1 diff --git a/src/config/param.sunx86_58.h b/src/config/param.sunx86_58.h index e9969d35e1..d337b5105b 100644 --- a/src/config/param.sunx86_58.h +++ b/src/config/param.sunx86_58.h @@ -42,9 +42,6 @@ #define AFS_SYSCALL 65 -/* File system entry (used if mount.h doesn't define MOUNT_AFS */ -#define AFS_MOUNT_AFS "afs" - /* Machine / Operating system information */ #define sys_sunx86_58 1 #define SYS_NAME "sunx86_58" @@ -131,8 +128,7 @@ #define AFS_3DISPARES 1 /* Utilize the 3 available disk inode 'spares' */ #define AFS_SYSCALL 65 -/* File system entry (used if mount.h doesn't define MOUNT_AFS */ -#define AFS_MOUNT_AFS 1 +#define AFS_FSNO 1 /* Machine / Operating system information */ #define sys_sunx86_58 1 diff --git a/src/config/param.sunx86_59.h b/src/config/param.sunx86_59.h index 0c072f7073..2b905bf0d5 100644 --- a/src/config/param.sunx86_59.h +++ b/src/config/param.sunx86_59.h @@ -43,9 +43,6 @@ #define AFS_SYSCALL 65 -/* File system entry (used if mount.h doesn't define MOUNT_AFS */ -#define AFS_MOUNT_AFS "afs" - /* Machine / Operating system information */ #define sys_sunx86_59 1 #define SYS_NAME "sunx86_59" @@ -135,8 +132,7 @@ #define AFS_3DISPARES 1 /* Utilize the 3 available disk inode 'spares' */ #define AFS_SYSCALL 65 -/* File system entry (used if mount.h doesn't define MOUNT_AFS */ -#define AFS_MOUNT_AFS 1 +#define AFS_FSNO 1 /* Machine / Operating system information */ #define sys_sunx86_59 1 diff --git a/src/config/param.x86_darwin_100.h b/src/config/param.x86_darwin_100.h index 554eb24a8b..45ed144fb0 100644 --- a/src/config/param.x86_darwin_100.h +++ b/src/config/param.x86_darwin_100.h @@ -36,9 +36,6 @@ #define AFS_NEW_BKG 1 #define NEED_IOCTL32 -/* File system entry (used if mount.h doesn't define MOUNT_AFS */ -#define AFS_MOUNT_AFS "afs" - /* Machine / Operating system information */ #if defined(__ppc__) #define sys_ppc_darwin_12 1 @@ -163,9 +160,6 @@ #define DARWIN_REFBASE 0 #define AFS_WARNUSER_MARINER_ENV 1 -/* File system entry (used if mount.h doesn't define MOUNT_AFS */ -#define AFS_MOUNT_AFS "afs" - /* Machine / Operating system information */ #if defined(__ppc__) #define sys_ppc_darwin_12 1 diff --git a/src/config/param.x86_darwin_110.h b/src/config/param.x86_darwin_110.h index ca893b9e9a..c4179dcde9 100644 --- a/src/config/param.x86_darwin_110.h +++ b/src/config/param.x86_darwin_110.h @@ -37,9 +37,6 @@ #define AFS_NEW_BKG 1 #define NEED_IOCTL32 -/* File system entry (used if mount.h doesn't define MOUNT_AFS */ -#define AFS_MOUNT_AFS "afs" - /* Machine / Operating system information */ #if defined(__ppc__) #define sys_ppc_darwin_12 1 @@ -166,9 +163,6 @@ #define DARWIN_REFBASE 0 #define AFS_WARNUSER_MARINER_ENV 1 -/* File system entry (used if mount.h doesn't define MOUNT_AFS */ -#define AFS_MOUNT_AFS "afs" - /* Machine / Operating system information */ #if defined(__ppc__) #define sys_ppc_darwin_12 1 diff --git a/src/config/param.x86_darwin_120.h b/src/config/param.x86_darwin_120.h index a6c881a9e2..01e5dd14b5 100644 --- a/src/config/param.x86_darwin_120.h +++ b/src/config/param.x86_darwin_120.h @@ -38,9 +38,6 @@ #define AFS_NEW_BKG 1 #define NEED_IOCTL32 -/* File system entry (used if mount.h doesn't define MOUNT_AFS */ -#define AFS_MOUNT_AFS "afs" - /* Machine / Operating system information */ #if defined(__ppc__) #define sys_ppc_darwin_12 1 @@ -170,9 +167,6 @@ #define DARWIN_REFBASE 0 #define AFS_WARNUSER_MARINER_ENV 1 -/* File system entry (used if mount.h doesn't define MOUNT_AFS */ -#define AFS_MOUNT_AFS "afs" - /* Machine / Operating system information */ #if defined(__ppc__) #define sys_ppc_darwin_12 1 diff --git a/src/config/param.x86_darwin_130.h b/src/config/param.x86_darwin_130.h index 7571e05fec..8102da6505 100644 --- a/src/config/param.x86_darwin_130.h +++ b/src/config/param.x86_darwin_130.h @@ -39,9 +39,6 @@ #define AFS_NEW_BKG 1 #define NEED_IOCTL32 -/* File system entry (used if mount.h doesn't define MOUNT_AFS */ -#define AFS_MOUNT_AFS "afs" - /* Machine / Operating system information */ #if defined(__ppc__) #define sys_ppc_darwin_12 1 @@ -174,9 +171,6 @@ #define DARWIN_REFBASE 0 #define AFS_WARNUSER_MARINER_ENV 1 -/* File system entry (used if mount.h doesn't define MOUNT_AFS */ -#define AFS_MOUNT_AFS "afs" - /* Machine / Operating system information */ #if defined(__ppc__) #define sys_ppc_darwin_12 1 diff --git a/src/config/param.x86_darwin_140.h b/src/config/param.x86_darwin_140.h index 989e39b2e6..f6d1aac003 100644 --- a/src/config/param.x86_darwin_140.h +++ b/src/config/param.x86_darwin_140.h @@ -40,9 +40,6 @@ #define AFS_NEW_BKG 1 #define NEED_IOCTL32 -/* File system entry (used if mount.h doesn't define MOUNT_AFS */ -#define AFS_MOUNT_AFS "afs" - /* Machine / Operating system information */ #if defined(__ppc__) #define sys_ppc_darwin_12 1 @@ -178,9 +175,6 @@ #define DARWIN_REFBASE 0 #define AFS_WARNUSER_MARINER_ENV 1 -/* File system entry (used if mount.h doesn't define MOUNT_AFS */ -#define AFS_MOUNT_AFS "afs" - /* Machine / Operating system information */ #if defined(__ppc__) #define sys_ppc_darwin_12 1 diff --git a/src/config/param.x86_darwin_150.h b/src/config/param.x86_darwin_150.h index 666c1de7fe..7176126bc0 100644 --- a/src/config/param.x86_darwin_150.h +++ b/src/config/param.x86_darwin_150.h @@ -41,9 +41,6 @@ #define AFS_NEW_BKG 1 #define NEED_IOCTL32 -/* File system entry (used if mount.h doesn't define MOUNT_AFS */ -#define AFS_MOUNT_AFS "afs" - /* Machine / Operating system information */ #if defined(__ppc__) #define sys_ppc_darwin_12 1 @@ -182,9 +179,6 @@ #define DARWIN_REFBASE 0 #define AFS_WARNUSER_MARINER_ENV 1 -/* File system entry (used if mount.h doesn't define MOUNT_AFS */ -#define AFS_MOUNT_AFS "afs" - /* Machine / Operating system information */ #if defined(__ppc__) #define sys_ppc_darwin_12 1 diff --git a/src/config/param.x86_darwin_160.h b/src/config/param.x86_darwin_160.h index f2d786a533..a72cdec66b 100644 --- a/src/config/param.x86_darwin_160.h +++ b/src/config/param.x86_darwin_160.h @@ -42,9 +42,6 @@ #define AFS_NEW_BKG 1 #define NEED_IOCTL32 -/* File system entry (used if mount.h doesn't define MOUNT_AFS */ -#define AFS_MOUNT_AFS "afs" - /* Machine / Operating system information */ #if defined(__ppc__) #define sys_ppc_darwin_12 1 @@ -186,9 +183,6 @@ #define DARWIN_REFBASE 0 #define AFS_WARNUSER_MARINER_ENV 1 -/* File system entry (used if mount.h doesn't define MOUNT_AFS */ -#define AFS_MOUNT_AFS "afs" - /* Machine / Operating system information */ #if defined(__ppc__) #define sys_ppc_darwin_12 1 diff --git a/src/config/param.x86_darwin_170.h b/src/config/param.x86_darwin_170.h index 99c8cd78f9..b7bfa2735b 100644 --- a/src/config/param.x86_darwin_170.h +++ b/src/config/param.x86_darwin_170.h @@ -43,9 +43,6 @@ #define AFS_NEW_BKG 1 #define NEED_IOCTL32 -/* File system entry (used if mount.h doesn't define MOUNT_AFS */ -#define AFS_MOUNT_AFS "afs" - /* Machine / Operating system information */ #if defined(__ppc__) #define sys_ppc_darwin_12 1 @@ -190,9 +187,6 @@ #define DARWIN_REFBASE 0 #define AFS_WARNUSER_MARINER_ENV 1 -/* File system entry (used if mount.h doesn't define MOUNT_AFS */ -#define AFS_MOUNT_AFS "afs" - /* Machine / Operating system information */ #if defined(__ppc__) #define sys_ppc_darwin_12 1 diff --git a/src/config/param.x86_darwin_180.h b/src/config/param.x86_darwin_180.h index 6b6ac01838..48fd694f20 100644 --- a/src/config/param.x86_darwin_180.h +++ b/src/config/param.x86_darwin_180.h @@ -44,9 +44,6 @@ #define AFS_NEW_BKG 1 #define NEED_IOCTL32 -/* File system entry (used if mount.h doesn't define MOUNT_AFS */ -#define AFS_MOUNT_AFS "afs" - /* Machine / Operating system information */ #if defined(__ppc__) #define sys_ppc_darwin_12 1 @@ -194,9 +191,6 @@ #define DARWIN_REFBASE 0 #define AFS_WARNUSER_MARINER_ENV 1 -/* File system entry (used if mount.h doesn't define MOUNT_AFS */ -#define AFS_MOUNT_AFS "afs" - /* Machine / Operating system information */ #if defined(__ppc__) #define sys_ppc_darwin_12 1 diff --git a/src/config/param.x86_darwin_190.h b/src/config/param.x86_darwin_190.h index bd4e302da4..173be362e3 100644 --- a/src/config/param.x86_darwin_190.h +++ b/src/config/param.x86_darwin_190.h @@ -45,9 +45,6 @@ #define AFS_NEW_BKG 1 #define NEED_IOCTL32 -/* File system entry (used if mount.h doesn't define MOUNT_AFS */ -#define AFS_MOUNT_AFS "afs" - /* Machine / Operating system information */ #if defined(__ppc__) #define sys_ppc_darwin_12 1 @@ -200,9 +197,6 @@ #define DARWIN_REFBASE 0 #define AFS_WARNUSER_MARINER_ENV 1 -/* File system entry (used if mount.h doesn't define MOUNT_AFS */ -#define AFS_MOUNT_AFS "afs" - /* Machine / Operating system information */ #if defined(__ppc__) #define sys_ppc_darwin_12 1 diff --git a/src/config/param.x86_darwin_80.h b/src/config/param.x86_darwin_80.h index fc70f98362..3e51b13b6c 100644 --- a/src/config/param.x86_darwin_80.h +++ b/src/config/param.x86_darwin_80.h @@ -28,9 +28,6 @@ #define AFS_WARNUSER_MARINER_ENV 1 #define DARWIN_REFBASE 3 -/* File system entry (used if mount.h doesn't define MOUNT_AFS */ -#define AFS_MOUNT_AFS "afs" - /* Machine / Operating system information */ #if defined(__ppc__) #define sys_ppc_darwin_12 1 @@ -119,9 +116,6 @@ #define DARWIN_REFBASE 0 #define AFS_NEW_BKG 1 -/* File system entry (used if mount.h doesn't define MOUNT_AFS */ -#define AFS_MOUNT_AFS "afs" - /* Machine / Operating system information */ #if defined(__ppc__) #define sys_ppc_darwin_12 1 diff --git a/src/config/param.x86_darwin_90.h b/src/config/param.x86_darwin_90.h index 7f832f99fb..2298ad3e98 100644 --- a/src/config/param.x86_darwin_90.h +++ b/src/config/param.x86_darwin_90.h @@ -31,9 +31,6 @@ #define AFS_CACHE_VNODE_PATH #define AFS_NEW_BKG 1 -/* File system entry (used if mount.h doesn't define MOUNT_AFS */ -#define AFS_MOUNT_AFS "afs" - /* Machine / Operating system information */ #if defined(__ppc__) #define sys_ppc_darwin_12 1 @@ -123,9 +120,6 @@ #define DARWIN_REFBASE 0 #define AFS_WARNUSER_MARINER_ENV 1 -/* File system entry (used if mount.h doesn't define MOUNT_AFS */ -#define AFS_MOUNT_AFS "afs" - /* Machine / Operating system information */ #if defined(__ppc__) #define sys_ppc_darwin_12 1