From 6c68c39c83187e94fcde37801f23d55ee79555c0 Mon Sep 17 00:00:00 2001 From: Andrew Deason Date: Tue, 1 Jul 2008 23:28:59 +0000 Subject: [PATCH] STABLE14-libuafs-fixes-20080701 LICENSE IPL10 FIXES 104698, 104699, 104305 make cellname get init'd right. correct startup argument order to match what afsd does. call lookupname correctly (when did this break?) at the same time, move the lookupname define out of afs_osi.h and into each osi_machdep.h (cherry picked from commit c61a8f37c9957034961aed8abc2a1adb046247d3) --- src/afs/IRIX/osi_machdep.h | 3 +++ src/afs/NBSD/osi_machdep.h | 3 +++ src/afs/UKERNEL/afs_usrops.c | 2 +- src/afs/UKERNEL/osi_machdep.h | 3 +++ src/afs/afs_osi.h | 9 --------- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/afs/IRIX/osi_machdep.h b/src/afs/IRIX/osi_machdep.h index 241deabdd..196a7ac53 100644 --- a/src/afs/IRIX/osi_machdep.h +++ b/src/afs/IRIX/osi_machdep.h @@ -29,6 +29,9 @@ extern time_t time; /* This gets redefined from ucred to cred in osi_vfs.h, just do it right */ #define AFS_UCRED cred +#undef gop_lookupname +#define gop_lookupname(fnamep,segflg,followlink,compvpp) lookupname((fnamep),(segflg),(followlink),NULL,(compvpp), NULL) + #define osi_vnhold(avc, r) do { VN_HOLD(AFSTOV(avc)); } while(0) #undef afs_osi_Alloc_NoSleep diff --git a/src/afs/NBSD/osi_machdep.h b/src/afs/NBSD/osi_machdep.h index 8703c92ab..f513d8149 100644 --- a/src/afs/NBSD/osi_machdep.h +++ b/src/afs/NBSD/osi_machdep.h @@ -37,6 +37,9 @@ extern struct timeval time; #define afs_bufferpages bufpages +#undef gop_lookupname +#define gop_lookupname(fnamep,segflg,followlink,compvpp) lookupname((fnamep),(segflg),(followlink),NULL,(compvpp)) + #define osi_vnhold(avc,r) do { \ if ((avc)->vrefCount) { VN_HOLD((struct vnode *)(avc)); } \ else osi_Panic("refcnt==0"); } while(0) diff --git a/src/afs/UKERNEL/afs_usrops.c b/src/afs/UKERNEL/afs_usrops.c index 2137b94c3..32967a2d4 100644 --- a/src/afs/UKERNEL/afs_usrops.c +++ b/src/afs/UKERNEL/afs_usrops.c @@ -1641,7 +1641,7 @@ uafs_Init(char *rn, char *mountDirParam, char *confDirParam, /* * Set the primary cell name. */ - call_syscall(AFSOP_SET_THISCELL, (long)afs_LclCellName, 0, 0, 0, 0); + call_syscall(AFSCALL_CALL, AFSOP_SET_THISCELL, (long)afs_LclCellName, 0, 0, 0); if ((logfd = fopen(fullpn_AFSLogFile, "r+")) == 0) { if (afsd_verbose) diff --git a/src/afs/UKERNEL/osi_machdep.h b/src/afs/UKERNEL/osi_machdep.h index 97cc6c584..19a25f55c 100644 --- a/src/afs/UKERNEL/osi_machdep.h +++ b/src/afs/UKERNEL/osi_machdep.h @@ -36,6 +36,9 @@ #define afs_hz HZ #define osi_Time() (time(NULL)) +#undef gop_lookupname +#define gop_lookupname(fnamep,segflg,followlink,compvpp) lookupname((fnamep),(segflg),(followlink),(compvpp)) + #define osi_vnhold(avc, r) do { VN_HOLD(AFSTOV(avc)); } while(0) #define afs_suser(x) suser(x) diff --git a/src/afs/afs_osi.h b/src/afs/afs_osi.h index c66ece886..799caabd8 100644 --- a/src/afs/afs_osi.h +++ b/src/afs/afs_osi.h @@ -150,15 +150,6 @@ extern struct vnodeops *afs_ops; #endif #endif -#ifdef AFS_SGI65_ENV -#define gop_lookupname(fnamep,segflg,followlink,compvpp) \ - lookupname((fnamep),(segflg),(followlink),NULL,(compvpp),\ - NULL) -#else -#define gop_lookupname(fnamep,segflg,followlink,compvpp) \ - lookupname((fnamep),(segflg),(followlink),NULL,(compvpp)) -#endif - /* * In IRIX 6.5 we cannot have DEBUG turned on since certain * system-defined structures are a different size with DEBUG on, the -- 2.39.5