#include <afs/param.h>
#include <roken.h>
-#ifdef IGNORE_SOME_GCC_WARNINGS
-# pragma GCC diagnostic warning "-Wdeprecated-declarations"
-#endif
-
#define VFS 1
#include <afs/stds.h>
+#include <afs/opr.h>
+#include <afs/opr_assert.h>
#include <afs/cmd.h>
#include "afsd.h"
-#include <afs/afs_assert.h>
#include <afs/afsutil.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <signal.h>
-#include <string.h>
-#include <stdlib.h>
-#include <time.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+
#include <sys/file.h>
-#include <errno.h>
-#include <sys/time.h>
#include <sys/wait.h>
/* darwin dirent.h doesn't give us the prototypes we want if KERNEL is
# include <dirent.h>
#endif
-
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-
#ifdef HAVE_SYS_FS_TYPES_H
#include <sys/fs_types.h>
#endif
#include <sys/fstyp.h>
#endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
+#include <ctype.h>
-#include <netinet/in.h>
#include <afs/afs_args.h>
#include <afs/cellconfig.h>
-#include <ctype.h>
#include <afs/afssyscalls.h>
#include <afs/afsutil.h>
#include <afs/sys_prototypes.h>
-#ifdef AFS_SGI61_ENV
-#include <unistd.h>
-#include <libelf.h>
-#include <dwarf.h>
-#include <libdwarf.h>
-void set_staticaddrs(void);
-#endif /* AFS_SGI61_ENV */
#if defined(AFS_SGI62_ENV) && !defined(AFS_SGI65_ENV)
#include <sym.h>
#include <symconst.h>
#ifdef AFS_DARWIN_ENV
#ifdef AFS_DARWIN80_ENV
-#include <sys/ioctl.h>
#include <sys/xattr.h>
#endif
#include <CoreFoundation/CoreFoundation.h>
/*
* Global configuration variables.
*/
-static afs_int32 enable_rxbind = 0;
-static afs_int32 afs_shutdown = 0;
-static afs_int32 cacheBlocks; /*Num blocks in the cache */
-static afs_int32 cacheFiles; /*Optimal # of files in workstation cache */
-static afs_int32 rwpct = 0;
-static afs_int32 ropct = 0;
-static afs_int32 cacheStatEntries; /*Number of stat cache entries */
-static char cacheBaseDir[1024]; /*Where the workstation AFS cache lives */
-static char confDir[1024]; /*Where the workstation AFS configuration lives */
+static int enable_rxbind = 0;
+static int afs_shutdown = 0;
+static int cacheBlocks; /*Num blocks in the cache */
+static int cacheFiles; /*Optimal # of files in workstation cache */
+static int rwpct = 0;
+static int ropct = 0;
+static int cacheStatEntries; /*Number of stat cache entries */
+static char *cacheBaseDir; /*Where the workstation AFS cache lives */
+static char *confDir; /*Where the workstation AFS configuration lives */
static char fullpn_DCacheFile[1024]; /*Full pathname of DCACHEFILE */
static char fullpn_VolInfoFile[1024]; /*Full pathname of VOLINFOFILE */
static char fullpn_CellInfoFile[1024]; /*Full pathanem of CELLINFOFILE */
static int sawBiod = 0;
#endif
static int sawCacheStatEntries = 0;
-char afsd_cacheMountDir[1024]; /*Mount directory for AFS */
-static char rootVolume[64] = "root.afs"; /*AFS root volume name */
-static afs_int32 cacheSetTime = 0; /*Keep checking time to avoid drift? */
+char *afsd_cacheMountDir;
+static char *rootVolume = NULL;
#ifdef AFS_XBSD_ENV
static int createAndTrunc = O_RDWR | O_CREAT | O_TRUNC; /*Create & truncate on open */
#else
int PartSizeOverflow(char *path, int cs);
+static int afsd_syscall(int code, ...);
+
#if defined(AFS_SUN510_ENV) && defined(RXK_LISTENER_ENV)
-static void fork_rx_syscall_wait();
+static void fork_rx_syscall_wait(const char *rn, int syscall, ...);
#endif
-static void fork_rx_syscall();
-static void fork_syscall();
+static void fork_rx_syscall(const char *rn, int syscall, ...);
+static void fork_syscall(const char *rn, int syscall, ...);
+
+enum optionsList {
+ OPT_blocks,
+ OPT_files,
+ OPT_rootvol,
+ OPT_stat,
+ OPT_memcache,
+ OPT_cachedir,
+ OPT_mountdir,
+ OPT_daemons,
+ OPT_nosettime,
+ OPT_verbose,
+ OPT_rmtsys,
+ OPT_debug,
+ OPT_chunksize,
+ OPT_dcache,
+ OPT_volumes,
+ OPT_biods,
+ OPT_prealloc,
+ OPT_confdir,
+ OPT_logfile,
+ OPT_waitclose,
+ OPT_shutdown,
+ OPT_peerstats,
+ OPT_processstats,
+ OPT_memallocsleep,
+ OPT_afsdb,
+ OPT_filesdir,
+ OPT_dynroot,
+ OPT_fakestat,
+ OPT_fakestatall,
+ OPT_nomount,
+ OPT_backuptree,
+ OPT_rxbind,
+ OPT_settime,
+ OPT_rxpck,
+ OPT_splitcache,
+ OPT_nodynvcache,
+ OPT_rxmaxmtu,
+ OPT_dynrootsparse,
+ OPT_rxmaxfrags,
+};
#if defined(AFS_DARWIN_ENV) && !defined(AFS_ARM_DARWIN_ENV)
static void
afs_uint32 addrbuf[MAXIPADDRS], maskbuf[MAXIPADDRS],
mtubuf[MAXIPADDRS];
char reason[1024];
- afs_int32 code;
+ int code;
code =
parseNetFiles(addrbuf, maskbuf, mtubuf, MAXIPADDRS, reason,
if (code > 0) {
/* Note we're refreshing */
code = code | 0x40000000;
- afsd_call_syscall(AFSOP_ADVISEADDR, code, addrbuf, maskbuf, mtubuf);
+ afsd_syscall(AFSOP_ADVISEADDR, code, addrbuf, maskbuf, mtubuf);
} else
printf("ADVISEADDR: Error in specifying interface addresses:%s\n",
reason);
static char rn[] = "ParseCacheInfoFile"; /*This routine's name */
FILE *cachefd; /*Descriptor for cache info file */
int parseResult; /*Result of our fscanf() */
- afs_int32 tCacheBlocks;
+ int tCacheBlocks;
char tCacheBaseDir[1024], *tbd, tCacheMountDir[1024], *tmd;
if (afsd_debug)
tbd++);
/* now copy in the fields not explicitly overridden by cmd args */
if (!sawCacheMountDir)
- strcpy(afsd_cacheMountDir, tmd);
+ afsd_cacheMountDir = strdup(tmd);
if (!sawCacheBaseDir)
- strcpy(cacheBaseDir, tbd);
+ cacheBaseDir = strdup(tbd);
if (!sawCacheBlocks)
cacheBlocks = tCacheBlocks;
cache_dir_list[dirNum]++; /* keep directory's file count */
if (cache_dir_list[dirNum] > nFilesPerDir) {
/* Too many files -- add to filelist */
- struct afsd_file_list *tmp = (struct afsd_file_list *)
- malloc(sizeof(*tmp));
+ struct afsd_file_list *tmp = malloc(sizeof(*tmp));
if (!tmp)
printf
("%s: MALLOC FAILED allocating file_list entry\n",
}
if (cache_dir_list == NULL) {
- cache_dir_list = (int *)malloc(maxDir * sizeof(*cache_dir_list));
+ cache_dir_list = malloc(maxDir * sizeof(*cache_dir_list));
if (cache_dir_list == NULL) {
printf("%s: Malloc Failed!\n", rn);
return (-1);
}
if (cache_dir_filelist == NULL) {
- cache_dir_filelist = (struct afsd_file_list **)
- malloc(maxDir * sizeof(*cache_dir_filelist));
+ cache_dir_filelist = calloc(maxDir, sizeof(*cache_dir_filelist));
if (cache_dir_filelist == NULL) {
printf("%s: Malloc Failed!\n", rn);
return (-1);
}
- memset(cache_dir_filelist, 0, maxDir * sizeof(*cache_dir_filelist));
}
if (dir_for_V == NULL) {
- dir_for_V = (int *)malloc(cacheFiles * sizeof(*dir_for_V));
+ dir_for_V = malloc(cacheFiles * sizeof(*dir_for_V));
if (dir_for_V == NULL) {
printf("%s: Malloc Failed!\n", rn);
return (-1);
{
int isHomeCell;
int i, code;
- afs_int32 cellFlags = 0;
+ int cellFlags = 0;
afs_int32 hosts[MAXHOSTSPERCELL];
/* figure out if this is the home cell */
* for upwards compatibility */
/* configure one cell */
- code = afsd_call_syscall(AFSOP_ADDCELL2, hosts, /* server addresses */
+ code = afsd_syscall(AFSOP_ADDCELL2, hosts, /* server addresses */
aci->name, /* cell name */
cellFlags, /* is this the home cell? */
aci->linkedCell); /* Linked cell, if any */
void *arock, struct afsconf_dir *adir)
{
/* push the alias into the kernel */
- afsd_call_syscall(AFSOP_ADDCELLALIAS, aca->aliasName, aca->realName);
+ afsd_syscall(AFSOP_ADDCELLALIAS, aca->aliasName, aca->realName);
return 0;
}
/* On some platforms you only get 4 args to an AFS call */
int sizeArg = ((sizeof acellName) << 16) | (sizeof kernelMsg);
code =
- afsd_call_syscall(AFSOP_AFSDB_HANDLER, acellName, kernelMsg, sizeArg);
+ afsd_syscall(AFSOP_AFSDB_HANDLER, acellName, kernelMsg, sizeArg);
if (code) { /* Something is wrong? */
sleep(1);
continue;
#endif
}
-#ifdef AFS_DARWIN_ENV
+#ifdef AFS_NEW_BKG
static void
BkgHandler(void)
{
char srcName[256];
char dstName[256];
- uspc = (struct afs_uspc_param *)malloc(sizeof(struct afs_uspc_param));
- memset(uspc, 0, sizeof(struct afs_uspc_param));
+ uspc = calloc(1, sizeof(struct afs_uspc_param));
memset(srcName, 0, sizeof(srcName));
memset(dstName, 0, sizeof(dstName));
/* pushing in a buffer this large */
uspc->bufSz = 256;
- code = afsd_call_syscall(AFSOP_BKG_HANDLER, uspc, srcName, dstName);
+ code = afsd_syscall(AFSOP_BKG_HANDLER, uspc, srcName, dstName);
if (code) { /* Something is wrong? */
if (code == -2) /* shutting down */
break;
static void *
daemon_thread(void *rock)
{
-#ifdef AFS_DARWIN80_ENV
+#ifdef AFS_NEW_BKG
/* Since the background daemon runs as a user process,
* need to drop the controlling TTY, etc.
*/
exit(1);
}
BkgHandler();
-#elif defined(AFS_AIX32_ENV)
- afsd_call_syscall(AFSOP_START_BKG, 0);
#else
- afsd_call_syscall(AFSOP_START_BKG);
+ afsd_syscall(AFSOP_START_BKG, 0);
#endif
return NULL;
}
#endif
/* call atoi on the appropriate parsed results */
- if (as->parms[0].items) {
- /* -blocks */
- cacheBlocks = atoi(as->parms[0].items->data);
+ if (cmd_OptionAsInt(as, OPT_blocks, &cacheBlocks) == 0)
sawCacheBlocks = 1;
- }
- if (as->parms[1].items) {
- /* -files */
- cacheFiles = atoi(as->parms[1].items->data);
- filesSet = 1; /* set when spec'd on cmd line */
- }
- if (as->parms[2].items) {
- /* -rootvol */
- strcpy(rootVolume, as->parms[2].items->data);
+
+ if (cmd_OptionAsInt(as, OPT_files, &cacheFiles) == 0)
+ filesSet = 1;
+
+ if (cmd_OptionAsString(as, OPT_rootvol, &rootVolume) == 0)
rootVolSet = 1;
- }
- if (as->parms[3].items) {
- /* -stat */
- cacheStatEntries = atoi(as->parms[3].items->data);
+
+ if (cmd_OptionAsInt(as, OPT_stat, &cacheStatEntries) == 0)
sawCacheStatEntries = 1;
- }
- if (as->parms[4].items) {
- /* -memcache */
- cacheBaseDir[0] = '\0';
+
+ if (cmd_OptionPresent(as, OPT_memcache)) {
+ cacheBaseDir = NULL;
sawCacheBaseDir = 1;
cacheFlags |= AFSCALL_INIT_MEMCACHE;
}
- if (as->parms[5].items) {
- /* -cachedir */
- strcpy(cacheBaseDir, as->parms[5].items->data);
+
+ if (cmd_OptionAsString(as, OPT_cachedir, &cacheBaseDir) == 0)
sawCacheBaseDir = 1;
- }
- if (as->parms[6].items) {
- /* -mountdir */
- strcpy(afsd_cacheMountDir, as->parms[6].items->data);
+
+ if (cmd_OptionAsString(as, OPT_mountdir, &afsd_cacheMountDir) == 0)
sawCacheMountDir = 1;
- }
- if (as->parms[7].items) {
- /* -daemons */
- nDaemons = atoi(as->parms[7].items->data);
- }
- if (as->parms[8].items) {
- /* -nosettime */
- cacheSetTime = 0;
- }
- if (as->parms[9].items) {
- /* -verbose */
- afsd_verbose = 1;
- }
- if (as->parms[10].items) {
- /* -rmtsys */
+
+ cmd_OptionAsInt(as, OPT_daemons, &nDaemons);
+
+ afsd_verbose = cmd_OptionPresent(as, OPT_verbose);
+
+ if (cmd_OptionPresent(as, OPT_rmtsys)) {
afsd_rmtsys = 1;
#ifdef UKERNEL
printf("-rmtsys not supported for UKERNEL\n");
return -1;
#endif
}
- if (as->parms[11].items) {
- /* -debug */
+
+ if (cmd_OptionPresent(as, OPT_debug)) {
afsd_debug = 1;
afsd_verbose = 1;
}
- if (as->parms[12].items) {
- /* -chunksize */
- chunkSize = atoi(as->parms[12].items->data);
+
+ if (cmd_OptionAsInt(as, OPT_chunksize, &chunkSize) == 0) {
if (chunkSize < 0 || chunkSize > 30) {
printf
("afsd:invalid chunk size (not in range 0-30), using default\n");
chunkSize = 0;
}
}
- if (as->parms[13].items) {
- /* -dcache */
- dCacheSize = atoi(as->parms[13].items->data);
+
+ if (cmd_OptionAsInt(as, OPT_dcache, &dCacheSize) == 0)
sawDCacheSize = 1;
- }
- if (as->parms[14].items) {
- /* -volumes */
- vCacheSize = atoi(as->parms[14].items->data);
- }
- if (as->parms[15].items) {
+
+ cmd_OptionAsInt(as, OPT_volumes, &vCacheSize);
+
+ if (cmd_OptionPresent(as, OPT_biods)) {
/* -biods */
#ifndef AFS_AIX32_ENV
printf
("afsd: [-biods] currently only enabled for aix3.x VM supported systems\n");
#else
- nBiods = atoi(as->parms[15].items->data);
- sawBiod = 1;
+ cmd_OptionAsInt(as, OPT_biods, &nBiods);
#endif
}
- if (as->parms[16].items) {
- /* -prealloc */
- preallocs = atoi(as->parms[16].items->data);
- }
- strcpy(confDir, AFSDIR_CLIENT_ETC_DIRPATH);
- if (as->parms[17].items) {
- /* -confdir */
- strcpy(confDir, as->parms[17].items->data);
+ cmd_OptionAsInt(as, OPT_prealloc, &preallocs);
+
+ if (cmd_OptionAsString(as, OPT_confdir, &confDir) == CMD_MISSING) {
+ confDir = strdup(AFSDIR_CLIENT_ETC_DIRPATH);
}
sprintf(fullpn_CacheInfo, "%s/%s", confDir, CACHEINFOFILE);
- if (as->parms[18].items) {
- /* -logfile */
+
+ if (cmd_OptionPresent(as, OPT_logfile)) {
printf("afsd: Ignoring obsolete -logfile flag\n");
}
- if (as->parms[19].items) {
- /* -waitclose */
- afsd_CloseSynch = 1;
- }
- if (as->parms[20].items) {
+
+ afsd_CloseSynch = cmd_OptionPresent(as, OPT_waitclose);
+
+ if (cmd_OptionPresent(as, OPT_shutdown)) {
/* -shutdown */
afs_shutdown = 1;
/*
* Cold shutdown is the default
*/
printf("afsd: Shutting down all afs processes and afs state\n");
- code = afsd_call_syscall(AFSOP_SHUTDOWN, 1);
+ code = afsd_syscall(AFSOP_SHUTDOWN, 1);
if (code) {
printf("afsd: AFS still mounted; Not shutting down\n");
exit(1);
}
exit(0);
}
- if (as->parms[21].items) {
- /* -enable_peer_stats */
- enable_peer_stats = 1;
- }
- if (as->parms[22].items) {
- /* -enable_process_stats */
- enable_process_stats = 1;
- }
- if (as->parms[23].items) {
- /* -mem_alloc_sleep */
+
+ enable_peer_stats = cmd_OptionPresent(as, OPT_peerstats);
+ enable_process_stats = cmd_OptionPresent(as, OPT_processstats);
+
+ if (cmd_OptionPresent(as, OPT_memallocsleep)) {
printf("afsd: -mem_alloc_sleep is deprecated -- ignored\n");
}
- if (as->parms[24].items) {
- /* -afsdb */
- enable_afsdb = 1;
- }
- if (as->parms[25].items) {
+
+ enable_afsdb = cmd_OptionPresent(as, OPT_afsdb);
+ if (cmd_OptionPresent(as, OPT_filesdir)) {
/* -files_per_subdir */
- int res = atoi(as->parms[25].items->data);
+ int res;
+ cmd_OptionAsInt(as, OPT_filesdir, &res);
if (res < 10 || res > (1 << 30)) {
printf
("afsd:invalid number of files per subdir, \"%s\". Ignored\n",
nFilesPerDir = res;
}
}
- if (as->parms[26].items) {
- /* -dynroot */
- enable_dynroot = 1;
- }
- if (as->parms[27].items) {
- /* -fakestat */
+ enable_dynroot = cmd_OptionPresent(as, OPT_dynroot);
+
+ if (cmd_OptionPresent(as, OPT_fakestat)) {
enable_fakestat = 2;
}
- if (as->parms[28].items) {
- /* -fakestat-all */
+ if (cmd_OptionPresent(as, OPT_fakestatall)) {
enable_fakestat = 1;
}
- if (as->parms[29].items) {
- /* -nomount */
- enable_nomount = 1;
- }
- if (as->parms[30].items) {
- /* -backuptree */
- enable_backuptree = 1;
- }
- if (as->parms[31].items) {
- /* -rxbind */
- enable_rxbind = 1;
- }
- if (as->parms[32].items) {
+ if (cmd_OptionPresent(as, OPT_settime)) {
/* -settime */
- cacheSetTime = 1;
+ printf("afsd: -settime ignored\n");
+ printf("afsd: the OpenAFS client no longer sets the system time; "
+ "please use NTP or\n");
+ printf("afsd: another such system to synchronize client time\n");
}
+ enable_nomount = cmd_OptionPresent(as, OPT_nomount);
+ enable_backuptree = cmd_OptionPresent(as, OPT_backuptree);
+ enable_rxbind = cmd_OptionPresent(as, OPT_rxbind);
+
/* set rx_extraPackets */
- if (as->parms[33].items) {
+ if (cmd_OptionPresent(as, OPT_rxpck)) {
/* -rxpck */
- int rxpck = atoi(as->parms[33].items->data);
+ int rxpck;
+ cmd_OptionAsInt(as, OPT_rxpck, &rxpck);
printf("afsd: set rxpck = %d\n", rxpck);
- code = afsd_call_syscall(AFSOP_SET_RXPCK, rxpck);
+ code = afsd_syscall(AFSOP_SET_RXPCK, rxpck);
if (code) {
printf("afsd: failed to set rxpck\n");
exit(1);
}
}
- if (as->parms[34].items) {
+ if (cmd_OptionPresent(as, OPT_splitcache)) {
char *c;
- if (!as->parms[34].items->data ||
- ((c = strchr(as->parms[34].items->data, '/')) == NULL))
+ char *var = NULL;
+
+ cmd_OptionAsString(as, OPT_splitcache, &var);
+
+ if (var == NULL || ((c = strchr(var, '/')) == NULL))
printf
("ignoring splitcache (specify as RW/RO percentages: 60/40)\n");
else {
- ropct = atoi((char *)c + 1);
+ ropct = atoi(c + 1);
*c = '\0';
- rwpct = atoi((char *)as->parms[34].items->data);
+ rwpct = atoi(var);
if ((rwpct != 0) && (ropct != 0) && (ropct + rwpct == 100)) {
/* -splitcache */
enable_splitcache = 1;
}
}
+ free(var);
}
- if (as->parms[35].items) {
+ if (cmd_OptionPresent(as, OPT_nodynvcache)) {
#ifdef AFS_MAXVCOUNT_ENV
- /* -disable-dynamic-vcaches */
afsd_dynamic_vcaches = 0;
#else
printf("afsd: Error toggling flag, dynamically allocated vcaches not supported on your platform\n");
printf("afsd: %s dynamically allocated vcaches\n", ( afsd_dynamic_vcaches ? "enabling" : "disabling" ));
#endif
- /* set -rxmaxmtu */
- if (as->parms[36].items) {
- /* -rxmaxmtu */
- rxmaxmtu = atoi(as->parms[36].items->data);
- }
- if (as->parms[37].items) {
- /* -dynroot-sparse */
+ cmd_OptionAsInt(as, OPT_rxmaxmtu, &rxmaxmtu);
+
+ if (cmd_OptionPresent(as, OPT_dynrootsparse)) {
enable_dynroot = 2;
}
- if (as->parms[38].items) {
- /* -rxmaxfrags */
- rxmaxfrags = atoi(as->parms[38].items->data);
+
+ cmd_OptionAsInt(as, OPT_rxmaxfrags, &rxmaxfrags);
+
+ /* parse cacheinfo file if this is a diskcache */
+ if (ParseCacheInfoFile()) {
+ exit(1);
}
+
return 0;
}
struct afsconf_dir *cdir; /* config dir */
int lookupResult; /*Result of GetLocalCellName() */
int i;
- afs_int32 code; /*Result of fork() */
+ int code; /*Result of fork() */
char *fsTypeMsg = NULL;
int cacheIteration; /*How many times through cache verification */
int vFilesFound; /*How many data cache files were found in sweep */
printf("%s: My home cell is '%s'\n", rn, LclCellName);
}
- /* parse cacheinfo file if this is a diskcache */
- if (ParseCacheInfoFile()) {
- exit(1);
- }
-
if (!enable_nomount) {
if (afsd_check_mount(rn, afsd_cacheMountDir)) {
return -1;
chunkSize = 20;
}
}
+
if (!filesSet) {
cacheFiles = cacheBlocks / 32; /* Assume 32k avg filesize */
/*
* Create and zero the inode table for the desired cache files.
*/
- inode_for_V = (AFSD_INO_T *) malloc(cacheFiles * sizeof(AFSD_INO_T));
+ inode_for_V = calloc(cacheFiles, sizeof(AFSD_INO_T));
if (inode_for_V == (AFSD_INO_T *) 0) {
printf
("%s: malloc() failed for cache file inode table with %d entries.\n",
rn, cacheFiles);
exit(1);
}
- memset(inode_for_V, '\0', (cacheFiles * sizeof(AFSD_INO_T)));
if (afsd_debug)
printf("%s: %d inode_for_V entries at 0x%x, %lu bytes\n", rn,
cacheFiles, inode_for_V, (cacheFiles * sizeof(AFSD_INO_T)));
#endif
- /*
- * Set up all the pathnames we'll need for later.
- */
- sprintf(fullpn_DCacheFile, "%s/%s", cacheBaseDir, DCACHEFILE);
- sprintf(fullpn_VolInfoFile, "%s/%s", cacheBaseDir, VOLINFOFILE);
- sprintf(fullpn_CellInfoFile, "%s/%s", cacheBaseDir, CELLINFOFILE);
- sprintf(fullpn_VFile, "%s/", cacheBaseDir);
- vFilePtr = fullpn_VFile + strlen(fullpn_VFile);
-
- if (!(cacheFlags & AFSCALL_INIT_MEMCACHE)
- && (fsTypeMsg = CheckCacheBaseDir(cacheBaseDir))) {
+ if (!(cacheFlags & AFSCALL_INIT_MEMCACHE)) {
+ /*
+ * Set up all the pathnames we'll need for later.
+ */
+ sprintf(fullpn_DCacheFile, "%s/%s", cacheBaseDir, DCACHEFILE);
+ sprintf(fullpn_VolInfoFile, "%s/%s", cacheBaseDir, VOLINFOFILE);
+ sprintf(fullpn_CellInfoFile, "%s/%s", cacheBaseDir, CELLINFOFILE);
+ sprintf(fullpn_VFile, "%s/", cacheBaseDir);
+ vFilePtr = fullpn_VFile + strlen(fullpn_VFile);
+
+ fsTypeMsg = CheckCacheBaseDir(cacheBaseDir);
+ if (fsTypeMsg) {
#ifdef AFS_SUN5_ENV
- printf("%s: WARNING: Cache dir check failed (%s)\n", rn, fsTypeMsg);
+ printf("%s: WARNING: Cache dir check failed (%s)\n", rn, fsTypeMsg);
#else
- printf("%s: ERROR: Cache dir check failed (%s)\n", rn, fsTypeMsg);
- exit(1);
+ printf("%s: ERROR: Cache dir check failed (%s)\n", rn, fsTypeMsg);
+ exit(1);
#endif
+ }
}
/*
/*
* Set the primary cell name.
*/
- afsd_call_syscall(AFSOP_SET_THISCELL, LclCellName);
+ afsd_syscall(AFSOP_SET_THISCELL, LclCellName);
/* Initialize RX daemons and services */
if (code > 0) {
if (enable_rxbind)
code = code | 0x80000000;
- afsd_call_syscall(AFSOP_ADVISEADDR, code, addrbuf, maskbuf, mtubuf);
+ afsd_syscall(AFSOP_ADVISEADDR, code, addrbuf, maskbuf, mtubuf);
} else
printf("ADVISEADDR: Error in specifying interface addresses:%s\n",
reason);
fork_rx_syscall(rn, AFSOP_START_RXCALLBACK, preallocs, enable_peer_stats,
enable_process_stats);
#else
- fork_syscall(rn, AFSOP_START_RXCALLBACK, preallocs);
+ fork_syscall(rn, AFSOP_START_RXCALLBACK, preallocs, 0, 0);
#endif
#if defined(AFS_SUN5_ENV) || defined(RXK_LISTENER_ENV) || defined(RXK_UPCALL_ENV)
if (afsd_verbose)
printf("%s: Forking AFSDB lookup handler.\n", rn);
afsd_fork(0, afsdb_thread, NULL);
}
- code = afsd_call_syscall(AFSOP_BASIC_INIT, 1);
+ code = afsd_syscall(AFSOP_BASIC_INIT, 1);
if (code) {
printf("%s: Error %d in basic initialization.\n", rn, code);
exit(1);
cparams.cacheDcaches = dCacheSize;
cparams.cacheVolumes = vCacheSize;
cparams.chunkSize = chunkSize;
- cparams.setTimeFlag = cacheSetTime;
+ cparams.setTimeFlag = 0;
cparams.memCacheFlag = cacheFlags;
cparams.dynamic_vcaches = afsd_dynamic_vcaches;
- afsd_call_syscall(AFSOP_CACHEINIT, &cparams);
+ afsd_syscall(AFSOP_CACHEINIT, &cparams);
/* do it before we init the cache inodes */
if (enable_splitcache) {
- afsd_call_syscall(AFSOP_BUCKETPCT, 1, rwpct);
- afsd_call_syscall(AFSOP_BUCKETPCT, 2, ropct);
+ afsd_syscall(AFSOP_BUCKETPCT, 1, rwpct);
+ afsd_syscall(AFSOP_BUCKETPCT, 2, ropct);
}
if (afsd_CloseSynch)
- afsd_call_syscall(AFSOP_CLOSEWAIT);
+ afsd_syscall(AFSOP_CLOSEWAIT);
/*
* Sweep the workstation AFS cache directory, remembering the inodes of
fullpn_DCacheFile);
/* once again, meaningless for a memory-based cache. */
if (!(cacheFlags & AFSCALL_INIT_MEMCACHE))
- afsd_call_syscall(AFSOP_CACHEINFO, fullpn_DCacheFile);
+ afsd_syscall(AFSOP_CACHEINFO, fullpn_DCacheFile);
/*
* Pass the kernel the name of the workstation cache file holding the
if (afsd_debug)
printf("%s: Calling AFSOP_CELLINFO: cell info file is '%s'\n", rn,
fullpn_CellInfoFile);
- afsd_call_syscall(AFSOP_CELLINFO, fullpn_CellInfoFile);
+ afsd_syscall(AFSOP_CELLINFO, fullpn_CellInfoFile);
}
if (rxmaxfrags) {
if (afsd_verbose)
printf("%s: Setting rxmaxfrags in kernel = %d\n", rn, rxmaxfrags);
- code = afsd_call_syscall(AFSOP_SET_RXMAXFRAGS, rxmaxfrags);
+ code = afsd_syscall(AFSOP_SET_RXMAXFRAGS, rxmaxfrags);
if (code)
printf("%s: Error seting rxmaxfrags\n", rn);
}
if (rxmaxmtu) {
if (afsd_verbose)
printf("%s: Setting rxmaxmtu in kernel = %d\n", rn, rxmaxmtu);
- code = afsd_call_syscall(AFSOP_SET_RXMAXMTU, rxmaxmtu);
+ code = afsd_syscall(AFSOP_SET_RXMAXMTU, rxmaxmtu);
if (code)
printf("%s: Error seting rxmaxmtu\n", rn);
}
if (afsd_verbose)
printf("%s: Enabling dynroot support in kernel%s.\n", rn,
(enable_dynroot==2)?", not showing cells.":"");
- code = afsd_call_syscall(AFSOP_SET_DYNROOT, 1);
+ code = afsd_syscall(AFSOP_SET_DYNROOT, 1);
if (code)
printf("%s: Error enabling dynroot support.\n", rn);
}
if (enable_fakestat) {
if (afsd_verbose)
printf("%s: Enabling fakestat support in kernel%s.\n", rn,
- (enable_fakestat==2)?" for all mountpoints."
+ (enable_fakestat==1)?" for all mountpoints."
:" for crosscell mountpoints");
- code = afsd_call_syscall(AFSOP_SET_FAKESTAT, enable_fakestat);
+ code = afsd_syscall(AFSOP_SET_FAKESTAT, enable_fakestat);
if (code)
printf("%s: Error enabling fakestat support.\n", rn);
}
if (enable_backuptree) {
if (afsd_verbose)
printf("%s: Enabling backup tree support in kernel.\n", rn);
- code = afsd_call_syscall(AFSOP_SET_BACKUPTREE, enable_backuptree);
+ code = afsd_syscall(AFSOP_SET_BACKUPTREE, enable_backuptree);
if (code)
printf("%s: Error enabling backup tree support.\n", rn);
}
if (afsd_verbose)
printf("%s: Calling AFSOP_ROOTVOLUME with '%s'\n", rn,
rootVolume);
- afsd_call_syscall(AFSOP_ROOTVOLUME, rootVolume);
+ afsd_syscall(AFSOP_ROOTVOLUME, rootVolume);
}
/*
fullpn_VolInfoFile);
/* once again, meaningless for a memory-based cache. */
if (!(cacheFlags & AFSCALL_INIT_MEMCACHE))
- afsd_call_syscall(AFSOP_VOLUMEINFO, fullpn_VolInfoFile);
+ afsd_syscall(AFSOP_VOLUMEINFO, fullpn_VolInfoFile);
/*
* Give the kernel the names of the AFS files cached on the workstation's
* disk.
*/
- if (afsd_debug)
- printf
- ("%s: Calling AFSOP_CACHEFILE for each of the %d files in '%s'\n",
- rn, cacheFiles, cacheBaseDir);
if (!(cacheFlags & AFSCALL_INIT_MEMCACHE)) {
- /* ... and again ... */
int nocachefile = 0;
+ if (afsd_debug)
+ printf
+ ("%s: Calling AFSOP_CACHEFILE for each of the %d files in '%s'\n",
+ rn, cacheFiles, cacheBaseDir);
+ /* ... and again ... */
for (currVFile = 0; currVFile < cacheFiles; currVFile++) {
if (!nocachefile) {
sprintf(fullpn_VFile, "%s/D%d/V%d", cacheBaseDir, dir_for_V[currVFile], currVFile);
- code = afsd_call_syscall(AFSOP_CACHEFILE, fullpn_VFile);
+ code = afsd_syscall(AFSOP_CACHEFILE, fullpn_VFile);
if (code) {
if (currVFile == 0) {
if (afsd_debug)
}
/* fall through to setup-by-inode */
}
-#ifdef AFS_SGI62_ENV
- afsd_call_syscall(AFSOP_CACHEINODE,
- (afs_uint32) (inode_for_V[currVFile] >> 32),
- (afs_uint32) (inode_for_V[currVFile] & 0xffffffff));
-#elif !(defined(AFS_LINUX26_ENV) || defined(AFS_CACHE_VNODE_PATH))
- afsd_call_syscall(AFSOP_CACHEINODE, inode_for_V[currVFile]);
+#if defined(AFS_SGI62_ENV) || !(defined(AFS_LINUX26_ENV) || defined(AFS_CACHE_VNODE_PATH))
+ afsd_syscall(AFSOP_CACHEINODE, inode_for_V[currVFile]);
#else
printf
("%s: Error calling AFSOP_CACHEINODE: not configured\n",
*/
if (afsd_debug)
printf("%s: Calling AFSOP_GO with cacheSetTime = %d\n", rn,
- cacheSetTime);
- afsd_call_syscall(AFSOP_GO, cacheSetTime);
+ 0);
+ afsd_syscall(AFSOP_GO, 0);
/*
* At this point, we have finished passing the kernel all the info
ts = cmd_CreateSyntax(NULL, mainproc, NULL, "start AFS");
/* 0 - 10 */
- cmd_AddParm(ts, "-blocks", CMD_SINGLE, CMD_OPTIONAL,
- "1024 byte blocks in cache");
- cmd_AddParm(ts, "-files", CMD_SINGLE, CMD_OPTIONAL, "files in cache");
- cmd_AddParm(ts, "-rootvol", CMD_SINGLE, CMD_OPTIONAL,
- "name of AFS root volume");
- cmd_AddParm(ts, "-stat", CMD_SINGLE, CMD_OPTIONAL,
- "number of stat entries");
- cmd_AddParm(ts, "-memcache", CMD_FLAG, CMD_OPTIONAL, "run diskless");
- cmd_AddParm(ts, "-cachedir", CMD_SINGLE, CMD_OPTIONAL, "cache directory");
- cmd_AddParm(ts, "-mountdir", CMD_SINGLE, CMD_OPTIONAL, "mount location");
- cmd_AddParm(ts, "-daemons", CMD_SINGLE, CMD_OPTIONAL,
- "number of daemons to use");
- cmd_AddParm(ts, "-nosettime", CMD_FLAG, CMD_OPTIONAL,
- "don't set the time");
- cmd_AddParm(ts, "-verbose", CMD_FLAG, CMD_OPTIONAL,
- "display lots of information");
- cmd_AddParm(ts, "-rmtsys", CMD_FLAG, CMD_OPTIONAL,
- "start NFS rmtsysd program");
-
- /* 11 - 20 */
- cmd_AddParm(ts, "-debug", CMD_FLAG, CMD_OPTIONAL, "display debug info");
- cmd_AddParm(ts, "-chunksize", CMD_SINGLE, CMD_OPTIONAL,
- "log(2) of chunk size");
- cmd_AddParm(ts, "-dcache", CMD_SINGLE, CMD_OPTIONAL,
- "number of dcache entries");
- cmd_AddParm(ts, "-volumes", CMD_SINGLE, CMD_OPTIONAL,
- "number of volume entries");
- cmd_AddParm(ts, "-biods", CMD_SINGLE, CMD_OPTIONAL,
- "number of bkg I/O daemons (aix vm)");
- cmd_AddParm(ts, "-prealloc", CMD_SINGLE, CMD_OPTIONAL,
- "number of 'small' preallocated blocks");
- cmd_AddParm(ts, "-confdir", CMD_SINGLE, CMD_OPTIONAL,
- "configuration directory");
- cmd_AddParm(ts, "-logfile", CMD_SINGLE, CMD_OPTIONAL,
- "Place to keep the CM log");
- cmd_AddParm(ts, "-waitclose", CMD_FLAG, CMD_OPTIONAL,
- "make close calls synchronous");
- cmd_AddParm(ts, "-shutdown", CMD_FLAG, CMD_OPTIONAL,
- "Shutdown all afs state");
- /* 21 - 30 */
- cmd_AddParm(ts, "-enable_peer_stats", CMD_FLAG, CMD_OPTIONAL | CMD_HIDE,
- "Collect rpc statistics by peer");
- cmd_AddParm(ts, "-enable_process_stats", CMD_FLAG,
- CMD_OPTIONAL | CMD_HIDE,
- "Collect rpc statistics for this process");
- cmd_AddParm(ts, "-mem_alloc_sleep", CMD_FLAG, (CMD_OPTIONAL | CMD_HIDE),
- "Allow sleeps when allocating memory cache");
- cmd_AddParm(ts, "-afsdb", CMD_FLAG, (CMD_OPTIONAL),
- "Enable AFSDB support");
- cmd_AddParm(ts, "-files_per_subdir", CMD_SINGLE, CMD_OPTIONAL,
- "log(2) of the number of cache files per cache subdirectory");
- cmd_AddParm(ts, "-dynroot", CMD_FLAG, CMD_OPTIONAL,
- "Enable dynroot support");
- cmd_AddParm(ts, "-fakestat", CMD_FLAG, CMD_OPTIONAL,
- "Enable fakestat support for cross-cell mounts");
- cmd_AddParm(ts, "-fakestat-all", CMD_FLAG, CMD_OPTIONAL,
- "Enable fakestat support for all mounts");
- cmd_AddParm(ts, "-nomount", CMD_FLAG, CMD_OPTIONAL, "Do not mount AFS");
- cmd_AddParm(ts, "-backuptree", CMD_FLAG, CMD_OPTIONAL,
- "Prefer backup volumes for mointpoints in backup volumes");
- /* 31 - 40 */
- cmd_AddParm(ts, "-rxbind", CMD_FLAG, CMD_OPTIONAL,
- "Bind the Rx socket (one interface only)");
- cmd_AddParm(ts, "-settime", CMD_FLAG, CMD_OPTIONAL, "set the time");
- cmd_AddParm(ts, "-rxpck", CMD_SINGLE, CMD_OPTIONAL,
- "set rx_extraPackets to this value");
- cmd_AddParm(ts, "-splitcache", CMD_SINGLE, CMD_OPTIONAL,
- "Percentage RW versus RO in cache (specify as 60/40)");
- cmd_AddParm(ts, "-disable-dynamic-vcaches", CMD_FLAG, CMD_OPTIONAL,
- "disable stat/vcache cache growing as needed");
- cmd_AddParm(ts, "-rxmaxmtu", CMD_SINGLE, CMD_OPTIONAL, "set rx max MTU to use");
- cmd_AddParm(ts, "-dynroot-sparse", CMD_FLAG, CMD_OPTIONAL,
- "Enable dynroot support with minimal cell list");
- cmd_AddParm(ts, "-rxmaxfrags", CMD_SINGLE, CMD_OPTIONAL,
- "Set the maximum number of UDP fragments Rx should send/receive"
- " per Rx packet");
+ cmd_AddParmAtOffset(ts, OPT_blocks, "-blocks", CMD_SINGLE,
+ CMD_OPTIONAL, "1024 byte blocks in cache");
+ cmd_AddParmAtOffset(ts, OPT_files, "-files", CMD_SINGLE,
+ CMD_OPTIONAL, "files in cache");
+ cmd_AddParmAtOffset(ts, OPT_rootvol, "-rootvol", CMD_SINGLE,
+ CMD_OPTIONAL, "name of AFS root volume");
+ cmd_AddParmAtOffset(ts, OPT_stat, "-stat", CMD_SINGLE,
+ CMD_OPTIONAL, "number of stat entries");
+ cmd_AddParmAtOffset(ts, OPT_memcache, "-memcache", CMD_FLAG,
+ CMD_OPTIONAL, "run diskless");
+ cmd_AddParmAtOffset(ts, OPT_cachedir, "-cachedir", CMD_SINGLE,
+ CMD_OPTIONAL, "cache directory");
+ cmd_AddParmAtOffset(ts, OPT_mountdir, "-mountdir", CMD_SINGLE,
+ CMD_OPTIONAL, "mount location");
+ cmd_AddParmAtOffset(ts, OPT_daemons, "-daemons", CMD_SINGLE,
+ CMD_OPTIONAL, "number of daemons to use");
+ cmd_AddParmAtOffset(ts, OPT_nosettime, "-nosettime", CMD_FLAG,
+ CMD_OPTIONAL, "don't set the time");
+ cmd_AddParmAtOffset(ts, OPT_verbose, "-verbose", CMD_FLAG,
+ CMD_OPTIONAL, "display lots of information");
+ cmd_AddParmAtOffset(ts, OPT_rmtsys, "-rmtsys", CMD_FLAG,
+ CMD_OPTIONAL, "start NFS rmtsysd program");
+ cmd_AddParmAtOffset(ts, OPT_debug, "-debug", CMD_FLAG,
+ CMD_OPTIONAL, "display debug info");
+ cmd_AddParmAtOffset(ts, OPT_chunksize, "-chunksize", CMD_SINGLE,
+ CMD_OPTIONAL, "log(2) of chunk size");
+ cmd_AddParmAtOffset(ts, OPT_dcache, "-dcache", CMD_SINGLE,
+ CMD_OPTIONAL, "number of dcache entries");
+ cmd_AddParmAtOffset(ts, OPT_volumes, "-volumes", CMD_SINGLE,
+ CMD_OPTIONAL, "number of volume entries");
+ cmd_AddParmAtOffset(ts, OPT_biods, "-biods", CMD_SINGLE,
+ CMD_OPTIONAL, "number of bkg I/O daemons (aix vm)");
+ cmd_AddParmAtOffset(ts, OPT_prealloc, "-prealloc", CMD_SINGLE,
+ CMD_OPTIONAL, "number of 'small' preallocated blocks");
+ cmd_AddParmAtOffset(ts, OPT_confdir, "-confdir", CMD_SINGLE,
+ CMD_OPTIONAL, "configuration directory");
+ cmd_AddParmAtOffset(ts, OPT_logfile, "-logfile", CMD_SINGLE,
+ CMD_OPTIONAL, "Place to keep the CM log");
+ cmd_AddParmAtOffset(ts, OPT_waitclose, "-waitclose", CMD_FLAG,
+ CMD_OPTIONAL, "make close calls synchronous");
+ cmd_AddParmAtOffset(ts, OPT_shutdown, "-shutdown", CMD_FLAG,
+ CMD_OPTIONAL, "Shutdown all afs state");
+ cmd_AddParmAtOffset(ts, OPT_peerstats, "-enable_peer_stats", CMD_FLAG,
+ CMD_OPTIONAL | CMD_HIDE,
+ "Collect rpc statistics by peer");
+ cmd_AddParmAtOffset(ts, OPT_processstats, "-enable_process_stats",
+ CMD_FLAG, CMD_OPTIONAL | CMD_HIDE,
+ "Collect rpc statistics for this process");
+ cmd_AddParmAtOffset(ts, OPT_memallocsleep, "-mem_alloc_sleep",
+ CMD_FLAG, CMD_OPTIONAL | CMD_HIDE,
+ "Allow sleeps when allocating memory cache");
+ cmd_AddParmAtOffset(ts, OPT_afsdb, "-afsdb", CMD_FLAG,
+ CMD_OPTIONAL, "Enable AFSDB support");
+ cmd_AddParmAtOffset(ts, OPT_filesdir, "-files_per_subdir", CMD_SINGLE,
+ CMD_OPTIONAL,
+ "log(2) of the number of cache files per "
+ "cache subdirectory");
+ cmd_AddParmAtOffset(ts, OPT_dynroot, "-dynroot", CMD_FLAG,
+ CMD_OPTIONAL, "Enable dynroot support");
+ cmd_AddParmAtOffset(ts, OPT_fakestat, "-fakestat", CMD_FLAG,
+ CMD_OPTIONAL,
+ "Enable fakestat support for cross-cell mounts");
+ cmd_AddParmAtOffset(ts, OPT_fakestatall, "-fakestat-all", CMD_FLAG,
+ CMD_OPTIONAL,
+ "Enable fakestat support for all mounts");
+ cmd_AddParmAtOffset(ts, OPT_nomount, "-nomount", CMD_FLAG,
+ CMD_OPTIONAL, "Do not mount AFS");
+ cmd_AddParmAtOffset(ts, OPT_backuptree, "-backuptree", CMD_FLAG,
+ CMD_OPTIONAL,
+ "Prefer backup volumes for mointpoints in backup "
+ "volumes");
+ cmd_AddParmAtOffset(ts, OPT_rxbind, "-rxbind", CMD_FLAG,
+ CMD_OPTIONAL,
+ "Bind the Rx socket (one interface only)");
+ cmd_AddParmAtOffset(ts, OPT_settime, "-settime", CMD_FLAG,
+ CMD_OPTIONAL, "set the time");
+ cmd_AddParmAtOffset(ts, OPT_rxpck, "-rxpck", CMD_SINGLE, CMD_OPTIONAL,
+ "set rx_extraPackets to this value");
+ cmd_AddParmAtOffset(ts, OPT_splitcache, "-splitcache", CMD_SINGLE,
+ CMD_OPTIONAL,
+ "Percentage RW versus RO in cache (specify as 60/40)");
+ cmd_AddParmAtOffset(ts, OPT_nodynvcache, "-disable-dynamic-vcaches",
+ CMD_FLAG, CMD_OPTIONAL,
+ "disable stat/vcache cache growing as needed");
+ cmd_AddParmAtOffset(ts, OPT_rxmaxmtu, "-rxmaxmtu", CMD_SINGLE,
+ CMD_OPTIONAL, "set rx max MTU to use");
+ cmd_AddParmAtOffset(ts, OPT_dynrootsparse, "-dynroot-sparse", CMD_FLAG,
+ CMD_OPTIONAL,
+ "Enable dynroot support with minimal cell list");
+ cmd_AddParmAtOffset(ts, OPT_rxmaxfrags, "-rxmaxfrags", CMD_SINGLE,
+ CMD_OPTIONAL,
+ "Set the maximum number of UDP fragments Rx should "
+ "send/receive per Rx packet");
}
int
return cmd_Dispatch(argc, argv);
}
-struct afsd_syscall_args {
- long syscall;
- long param1;
- long param2;
- long param3;
- long param4;
- long param5;
- const char *rn;
- int rxpri;
-};
-
/**
* entry point for calling a syscall from another proc/thread.
*
afsd_set_rx_rtpri();
}
- code = afsd_call_syscall(args->syscall, args->param1, args->param2,
- args->param3, args->param4, args->param5);
+ code = afsd_call_syscall(args);
if (code && args->syscall == AFSOP_START_CS) {
printf("%s: No check server daemon in client.\n", args->rn);
}
return NULL;
}
+static void
+afsd_syscall_populate(struct afsd_syscall_args *args, int syscall, va_list ap)
+{
+ afsd_syscall_param_t *params;
+
+ memset(args, 0, sizeof(struct afsd_syscall_args));
+
+ args->syscall = syscall;
+ params = args->params;
+
+ switch (syscall) {
+ case AFSOP_RXEVENT_DAEMON:
+ break;
+ case AFSOP_START_BKG:
+ case AFSOP_SHUTDOWN:
+ case AFSOP_SET_RXPCK:
+ case AFSOP_BASIC_INIT:
+ case AFSOP_SET_RXMAXFRAGS:
+ case AFSOP_SET_RXMAXMTU:
+ case AFSOP_SET_DYNROOT:
+ case AFSOP_SET_FAKESTAT:
+ case AFSOP_SET_BACKUPTREE:
+ case AFSOP_GO:
+ params[0] = CAST_SYSCALL_PARAM((va_arg(ap, int)));
+ break;
+ case AFSOP_SET_THISCELL:
+ case AFSOP_ROOTVOLUME:
+ case AFSOP_VOLUMEINFO:
+ case AFSOP_CACHEFILE:
+ params[0] = CAST_SYSCALL_PARAM((va_arg(ap, void *)));
+ break;
+ case AFSOP_ADDCELLALIAS:
+ params[0] = CAST_SYSCALL_PARAM((va_arg(ap, void *)));
+ params[1] = CAST_SYSCALL_PARAM((va_arg(ap, void *)));
+ break;
+ case AFSOP_AFSDB_HANDLER:
+ params[0] = CAST_SYSCALL_PARAM((va_arg(ap, void *)));
+ params[1] = CAST_SYSCALL_PARAM((va_arg(ap, void *)));
+ params[2] = CAST_SYSCALL_PARAM((va_arg(ap, int)));
+ break;
+ case AFSOP_BKG_HANDLER:
+ params[0] = CAST_SYSCALL_PARAM((va_arg(ap, void *)));
+ params[1] = CAST_SYSCALL_PARAM((va_arg(ap, void *)));
+ params[2] = CAST_SYSCALL_PARAM((va_arg(ap, void *)));
+ break;
+ case AFSOP_RXLISTENER_DAEMON:
+ case AFSOP_START_RXCALLBACK:
+ params[0] = CAST_SYSCALL_PARAM((va_arg(ap, int)));
+ params[1] = CAST_SYSCALL_PARAM((va_arg(ap, int)));
+ params[2] = CAST_SYSCALL_PARAM((va_arg(ap, int)));
+ break;
+ case AFSOP_ADVISEADDR:
+ params[0] = CAST_SYSCALL_PARAM((va_arg(ap, int)));
+ params[1] = CAST_SYSCALL_PARAM((va_arg(ap, void *)));
+ params[2] = CAST_SYSCALL_PARAM((va_arg(ap, void *)));
+ params[3] = CAST_SYSCALL_PARAM((va_arg(ap, void *)));
+ break;
+ case AFSOP_ADDCELL2:
+ params[0] = CAST_SYSCALL_PARAM((va_arg(ap, void *)));
+ params[1] = CAST_SYSCALL_PARAM((va_arg(ap, void *)));
+ params[2] = CAST_SYSCALL_PARAM((va_arg(ap, afs_int32)));
+ params[3] = CAST_SYSCALL_PARAM((va_arg(ap, void *)));
+ break;
+ case AFSOP_CACHEINODE:
+#if defined AFS_SGI62_ENV
+ {
+ afs_int64 tmp = va_arg(ap, afs_int64);
+ params[0] = CAST_SYSCALL_PARAM((afs_uint32)(tmp >> 32));
+ params[1] = CAST_SYSCALL_PARAM((afs_uint32)(tmp & 0xffffffff));
+ }
+#else
+ params[0] = CAST_SYSCALL_PARAM((va_arg(ap, afs_uint32)));
+#endif
+ break;
+ default:
+ printf("Unknown syscall enountered: %d\n", syscall);
+ opr_Assert(0);
+ }
+}
+
/**
* common code for calling a syscall in another proc/thread.
*
* @param[in] syscall syscall to run
*/
static void
-fork_syscall_impl(int rx, int wait, const char *rn, long syscall, long param1,
- long param2, long param3, long param4, long param5)
+fork_syscall_impl(int rx, int wait, const char *rn, int syscall, va_list ap)
{
struct afsd_syscall_args *args;
args = malloc(sizeof(*args));
-
- args->syscall = syscall;
- args->param1 = param1;
- args->param2 = param2;
- args->param3 = param3;
- args->param4 = param4;
- args->param5 = param5;
+ afsd_syscall_populate(args, syscall, ap);
args->rxpri = rx;
args->rn = rn;
* call a syscall in another process or thread.
*/
static void
-fork_syscall(const char *rn, long syscall, long param1, long param2,
- long param3, long param4, long param5)
+fork_syscall(const char *rn, int syscall, ...)
{
- fork_syscall_impl(0, 0, rn, syscall, param1, param2, param3, param4, param5);
+ va_list ap;
+
+ va_start(ap, syscall);
+ fork_syscall_impl(0, 0, rn, syscall, ap);
+ va_end(ap);
}
/**
* call a syscall in another process or thread, and give it RX priority.
*/
static void
-fork_rx_syscall(const char *rn, long syscall, long param1, long param2,
- long param3, long param4, long param5)
+fork_rx_syscall(const char *rn, int syscall, ...)
{
- fork_syscall_impl(1, 0, rn, syscall, param1, param2, param3, param4, param5);
+ va_list ap;
+
+ va_start(ap, syscall);
+ fork_syscall_impl(1, 0, rn, syscall, ap);
+ va_end(ap);
}
#if defined(AFS_SUN510_ENV) && defined(RXK_LISTENER_ENV)
* for it to finish before returning.
*/
static void
-fork_rx_syscall_wait(const char *rn, long syscall, long param1, long param2,
- long param3, long param4, long param5)
+fork_rx_syscall_wait(const char *rn, int syscall, ...)
{
- fork_syscall_impl(1, 1, rn, syscall, param1, param2, param3, param4, param5);
+ va_list ap;
+
+ va_start(ap, syscall);
+ fork_syscall_impl(1, 1, rn, syscall, ap);
+ va_end(ap);
}
#endif /* AFS_SUN510_ENV && RXK_LISTENER_ENV */
+
+static int
+afsd_syscall(int syscall, ...)
+{
+ va_list ap;
+ struct afsd_syscall_args args;
+
+ va_start(ap, syscall);
+ afsd_syscall_populate(&args, syscall, ap);
+ va_end(ap);
+
+ return afsd_call_syscall(&args);
+}