Index: openafs/src/WINNT/afsd/cm_buf.c diff -c openafs/src/WINNT/afsd/cm_buf.c:1.31.2.8 openafs/src/WINNT/afsd/cm_buf.c:1.31.2.9 *** openafs/src/WINNT/afsd/cm_buf.c:1.31.2.8 Sat Oct 21 16:47:48 2006 --- openafs/src/WINNT/afsd/cm_buf.c Thu Nov 9 16:26:51 2006 *************** *** 1470,1483 **** long buf_CleanVnode(struct cm_scache *scp, cm_user_t *userp, cm_req_t *reqp) { ! long code; cm_buf_t *bp; /* buffer we're hacking on */ cm_buf_t *nbp; /* next one */ long i; i = BUF_FILEHASH(&scp->fid); - code = 0; lock_ObtainWrite(&buf_globalLock); bp = cm_data.buf_fileHashTablepp[i]; if (bp) --- 1470,1483 ---- long buf_CleanVnode(struct cm_scache *scp, cm_user_t *userp, cm_req_t *reqp) { ! long code = 0; ! long wasDirty = 0; cm_buf_t *bp; /* buffer we're hacking on */ cm_buf_t *nbp; /* next one */ long i; i = BUF_FILEHASH(&scp->fid); lock_ObtainWrite(&buf_globalLock); bp = cm_data.buf_fileHashTablepp[i]; if (bp) *************** *** 1494,1505 **** bp->userp = userp; lock_ReleaseMutex(&bp->mx); } ! code = buf_CleanAsync(bp, reqp); buf_CleanWait(scp, bp); lock_ObtainMutex(&bp->mx); if (bp->flags & CM_BUF_ERROR) { ! if (code == 0 || code == -1) ! code = bp->error; if (code == 0) code = -1; } --- 1494,1504 ---- bp->userp = userp; lock_ReleaseMutex(&bp->mx); } ! wasDirty = buf_CleanAsync(bp, reqp); buf_CleanWait(scp, bp); lock_ObtainMutex(&bp->mx); if (bp->flags & CM_BUF_ERROR) { ! code = bp->error; if (code == 0) code = -1; } Index: openafs/src/WINNT/afsd/smb.c diff -c openafs/src/WINNT/afsd/smb.c:1.118.2.24 openafs/src/WINNT/afsd/smb.c:1.118.2.25 *** openafs/src/WINNT/afsd/smb.c:1.118.2.24 Sun Oct 22 08:25:38 2006 --- openafs/src/WINNT/afsd/smb.c Sat Nov 11 02:13:48 2006 *************** *** 5272,5277 **** --- 5272,5278 ---- char *maskp; /* pointer to star pattern of old file name */ int flags; /* tilde, casefold, etc */ char *newNamep; /* ptr to the new file's name */ + int any; } smb_renameRock_t; int smb_RenameProc(cm_scache_t *dscp, cm_dirEntry_t *dep, void *vrockp, osi_hyper_t *offp) *************** *** 5280,5286 **** smb_renameRock_t *rockp; int caseFold; int match; ! char shortName[13]; rockp = (smb_renameRock_t *) vrockp; --- 5281,5287 ---- smb_renameRock_t *rockp; int caseFold; int match; ! char shortName[13]=""; rockp = (smb_renameRock_t *) vrockp; *************** *** 5296,5311 **** match = smb_V3MatchMask(shortName, rockp->maskp, caseFold); } if (match) { ! code = cm_Rename(rockp->odscp, dep->name, rockp->ndscp, rockp->newNamep, rockp->userp, rockp->reqp); /* if the call worked, stop doing the search now, since we * really only want to rename one file. */ if (code == 0) code = CM_ERROR_STOPNOW; } ! else code = 0; return code; } --- 5297,5316 ---- match = smb_V3MatchMask(shortName, rockp->maskp, caseFold); } if (match) { ! rockp->any = 1; ! ! code = cm_Rename(rockp->odscp, dep->name, rockp->ndscp, rockp->newNamep, rockp->userp, rockp->reqp); /* if the call worked, stop doing the search now, since we * really only want to rename one file. */ + osi_Log1(smb_logp, "cm_Rename returns %ld", code); if (code == 0) code = CM_ERROR_STOPNOW; } ! else ! code = 0; return code; } *************** *** 5410,5415 **** --- 5415,5421 ---- rock.maskp = oldLastNamep; rock.flags = ((strchr(oldLastNamep, '~') != NULL) ? SMB_MASKFLAG_TILDE : 0); rock.newNamep = newLastNamep; + rock.any = 0; /* Check if the file already exists; if so return error */ code = cm_Lookup(newDscp,newLastNamep,CM_FLAG_CHECKPATH,userp,&req,&tmpscp); *************** *** 5453,5458 **** --- 5459,5470 ---- thyper.HighPart = 0; code = cm_ApplyDir(oldDscp, smb_RenameProc, &rock, &thyper, userp, &req, NULL); + if (code == 0 && !rock.any) { + thyper.LowPart = 0; + thyper.HighPart = 0; + rock.flags |= SMB_MASKFLAG_CASEFOLD; + code = cm_ApplyDir(oldDscp, smb_RenameProc, &rock, &thyper, userp, &req, NULL); + } osi_Log1(smb_logp, "smb_RenameProc returns %ld", code); if (code == CM_ERROR_STOPNOW) *************** *** 5648,5653 **** --- 5660,5666 ---- char *oldPathp; char *newPathp; char *tp; + long code; tp = smb_GetSMBData(inp, NULL); oldPathp = smb_ParseASCIIBlock(tp, &tp); *************** *** 5658,5667 **** OemToChar(newPathp,newPathp); osi_Log2(smb_logp, "smb rename [%s] to [%s]", ! osi_LogSaveString(smb_logp, oldPathp), ! osi_LogSaveString(smb_logp, newPathp)); ! return smb_Rename(vcp,inp,oldPathp,newPathp,0); } --- 5671,5683 ---- OemToChar(newPathp,newPathp); osi_Log2(smb_logp, "smb rename [%s] to [%s]", ! osi_LogSaveString(smb_logp, oldPathp), ! osi_LogSaveString(smb_logp, newPathp)); ! code = smb_Rename(vcp,inp,oldPathp,newPathp,0); ! ! osi_Log1(smb_logp, "smb rename returns 0x%x", code); ! return code; } *************** *** 5781,5786 **** --- 5797,5803 ---- rock.userp = userp; rock.reqp = &req; rock.dscp = dscp; + /* First do a case sensitive match, and if that fails, do a case insensitive match */ code = cm_ApplyDir(dscp, smb_RmdirProc, &rock, &thyper, userp, &req, NULL); if (code == 0 && !rock.any) { Index: openafs/src/WINNT/client_config/tab_advanced.cpp diff -c openafs/src/WINNT/client_config/tab_advanced.cpp:1.5 openafs/src/WINNT/client_config/tab_advanced.cpp:1.5.4.1 *** openafs/src/WINNT/client_config/tab_advanced.cpp:1.5 Sat Nov 5 01:47:53 2005 --- openafs/src/WINNT/client_config/tab_advanced.cpp Fri Nov 3 02:57:15 2006 *************** *** 31,37 **** #define ckCHUNK_MAX 1048576L #define cSTATS_MIN 256L ! #define cSTATS_MAX 10000L /* --- 31,37 ---- #define ckCHUNK_MAX 1048576L #define cSTATS_MIN 256L ! #define cSTATS_MAX 262144L /* Index: openafs/src/WINNT/doc/install/Documentation/en_US/html/index.htm diff -c openafs/src/WINNT/doc/install/Documentation/en_US/html/index.htm:1.5.4.4 openafs/src/WINNT/doc/install/Documentation/en_US/html/index.htm:1.5.4.5 *** openafs/src/WINNT/doc/install/Documentation/en_US/html/index.htm:1.5.4.4 Sat Oct 21 16:49:45 2006 --- openafs/src/WINNT/doc/install/Documentation/en_US/html/index.htm Thu Nov 9 16:35:43 2006 *************** *** 198,204 ****

OpenAFS for Windows

!

Version 1.5.10

 

--- 198,204 ----

OpenAFS for Windows

!

Version 1.5.11

 

*************** *** 223,229 **** mso-fareast-font-family:Symbol;mso-bidi-font-family:Symbol'>·         OpenAFS for Windows 1.5.10 Release Notes

·         OpenAFS for Windows 1.5.11 Release Notes

·       Microsoft ! Windows Vista RC2 (32-bit and 64-bit Intel)  (not for production use)

2.1.1 --- 703,709 ----

·       Microsoft ! Windows Vista (32-bit and 64-bit Intel)  (not for production use)

2.1.1 *************** *** 1713,1719 ****

If you are a site which utilizes MIT/Heimdal Kerberos principals to logon to Windows via a cross-realm relationship with a multi-domain Windows forest, you must enable Windows logon caching unless the ! workstation is Windows Vista RC2 or later.

3.42. Known Issues with Microsoft Windows Vista

!

OpenAFS for Windows works with Microsoft Windows Vista RC2 ! (Build 5744) and Longhorn Server (Build 5744) from both the command prompt and the Explorer Shell.  When performing an upgrade from earlier versions of Microsoft Windows the Microsoft Loopback Adapter (MSLA) will be uninstalled.   OpenAFS should be re-installed after the Microsoft Vista installation to restore the MSLA configuration.

!

When Vista RC2 resumes from standby mode, the AFS Client Service will panic.  This is due to a bug ! in Vista that is fixed in Build 5758.

Under the new Windows Vista security model, users are required to start applications under a new “administrative session” whenever --- 1846,1863 ----

3.42. Known Issues with Microsoft Windows Vista

!

OpenAFS for Windows works with Microsoft Windows Vista ! (RTM) from both the command prompt and the Explorer Shell.  When performing an upgrade from earlier versions of Microsoft Windows the Microsoft Loopback Adapter (MSLA) will be uninstalled.   OpenAFS should be re-installed after the Microsoft Vista installation to restore the MSLA configuration.

!

When Vista resumes from standby mode, the AFS Client Service will panic.  This is due to a bug ! in Vista that was not fixed before RTM. It is hoped ! that Microsoft will issue a QFE in the near future.

Under the new Windows Vista security model, users are required to start applications under a new “administrative session” whenever Index: openafs/src/afs/afs.h diff -c openafs/src/afs/afs.h:1.85.2.3 openafs/src/afs/afs.h:1.85.2.4 *** openafs/src/afs/afs.h:1.85.2.3 Mon Jul 31 17:27:38 2006 --- openafs/src/afs/afs.h Thu Nov 9 19:11:05 2006 *************** *** 86,91 **** --- 86,93 ---- #define AFS_NRXPACKETS 80 #define AFS_RXDEADTIME 50 #define AFS_HARDDEADTIME 120 + #define AFS_BLKBITS 12 + #define AFS_BLKSIZE (1 << AFS_BLKBITS) extern afs_int32 afs_rx_deadtime; extern afs_int32 afs_rx_harddead; Index: openafs/src/afs/afs_dcache.c diff -c openafs/src/afs/afs_dcache.c:1.64.4.2 openafs/src/afs/afs_dcache.c:1.64.4.3 *** openafs/src/afs/afs_dcache.c:1.64.4.2 Mon Jul 31 17:27:38 2006 --- openafs/src/afs/afs_dcache.c Thu Nov 9 19:20:19 2006 *************** *** 14,20 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/afs_dcache.c,v 1.64.4.2 2006/07/31 21:27:38 shadow Exp $"); #include "afs/sysincludes.h" /*Standard vendor system headers */ #include "afsincludes.h" /*AFS-based standard headers */ --- 14,20 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/afs_dcache.c,v 1.64.4.3 2006/11/10 00:20:19 shadow Exp $"); #include "afs/sysincludes.h" /*Standard vendor system headers */ #include "afsincludes.h" /*AFS-based standard headers */ *************** *** 2843,2849 **** if (CheckLock(&afs_xdcache) != -1) osi_Panic("getdslot nolock"); if (aslot < 0 || aslot >= afs_cacheFiles) ! osi_Panic("getdslot slot"); tdc = afs_indexTable[aslot]; if (tdc) { QRemove(&tdc->lruq); /* move to queue head */ --- 2843,2849 ---- if (CheckLock(&afs_xdcache) != -1) osi_Panic("getdslot nolock"); if (aslot < 0 || aslot >= afs_cacheFiles) ! osi_Panic("getdslot slot %d (of %d)", aslot, afs_cacheFiles); tdc = afs_indexTable[aslot]; if (tdc) { QRemove(&tdc->lruq); /* move to queue head */ *************** *** 2935,2941 **** if (CheckLock(&afs_xdcache) != -1) osi_Panic("getdslot nolock"); if (aslot < 0 || aslot >= afs_cacheFiles) ! osi_Panic("getdslot slot"); tdc = afs_indexTable[aslot]; if (tdc) { QRemove(&tdc->lruq); /* move to queue head */ --- 2935,2941 ---- if (CheckLock(&afs_xdcache) != -1) osi_Panic("getdslot nolock"); if (aslot < 0 || aslot >= afs_cacheFiles) ! osi_Panic("getdslot slot %d (of %d)", aslot, afs_cacheFiles); tdc = afs_indexTable[aslot]; if (tdc) { QRemove(&tdc->lruq); /* move to queue head */ Index: openafs/src/afs/afs_osi.h diff -c openafs/src/afs/afs_osi.h:1.42.4.3 openafs/src/afs/afs_osi.h:1.42.4.4 *** openafs/src/afs/afs_osi.h:1.42.4.3 Thu Aug 31 00:52:15 2006 --- openafs/src/afs/afs_osi.h Thu Nov 9 18:30:52 2006 *************** *** 41,47 **** struct osi_stat { afs_int32 size; /* file size in bytes */ - afs_int32 blksize; /* optimal transfer size in bytes */ afs_int32 mtime; /* modification date */ afs_int32 atime; /* access time */ }; --- 41,46 ---- Index: openafs/src/afs/afs_server.c diff -c openafs/src/afs/afs_server.c:1.43 openafs/src/afs/afs_server.c:1.43.4.1 *** openafs/src/afs/afs_server.c:1.43 Mon Nov 14 01:00:38 2005 --- openafs/src/afs/afs_server.c Thu Nov 9 19:20:19 2006 *************** *** 33,39 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/afs_server.c,v 1.43 2005/11/14 06:00:38 jaltman Exp $"); #include "afs/stds.h" #include "afs/sysincludes.h" /* Standard vendor system headers */ --- 33,39 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/afs_server.c,v 1.43.4.1 2006/11/10 00:20:19 shadow Exp $"); #include "afs/stds.h" #include "afs/sysincludes.h" /* Standard vendor system headers */ *************** *** 1383,1397 **** #elif defined(AFS_DARWIN80_ENV) { errno_t t; ! int cnt=0; ! ifaddr_t *addresses, address; ! t = ifnet_get_address_list_family(NULL, &addresses, AF_INET); ! if (t == 0) { ! while(addresses[cnt] != NULL) { ! afsi_SetServerIPRank(sa, address); ! cnt++; } ! ifnet_free_address_list(addresses); } } #elif defined(AFS_DARWIN60_ENV) --- 1383,1404 ---- #elif defined(AFS_DARWIN80_ENV) { errno_t t; ! unsigned int count; ! int cnt=0, m, j; ! ifaddr_t *ifads; ! ifnet_t *ifn; ! ! if (!ifnet_list_get(AF_INET, &ifn, &count)) { ! for (m = 0; m < count; m++) { ! if (!ifnet_get_address_list(ifn[m], &ifads)) { ! for (j = 0; ifads[j] != NULL && cnt < ADDRSPERSITE; j++) { ! afsi_SetServerIPRank(sa, ifads[j]); ! cnt++; ! } ! ifnet_free_address_list(ifads); ! } } ! ifnet_list_free(ifn); } } #elif defined(AFS_DARWIN60_ENV) Index: openafs/src/afs/afs_vcache.c diff -c openafs/src/afs/afs_vcache.c:1.114.2.3 openafs/src/afs/afs_vcache.c:1.114.2.5 *** openafs/src/afs/afs_vcache.c:1.114.2.3 Mon Jul 31 17:27:38 2006 --- openafs/src/afs/afs_vcache.c Thu Nov 9 23:36:34 2006 *************** *** 39,45 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/afs_vcache.c,v 1.114.2.3 2006/07/31 21:27:38 shadow Exp $"); #include "afs/sysincludes.h" /*Standard vendor system headers */ #include "afsincludes.h" /*AFS-based standard headers */ --- 39,45 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/afs_vcache.c,v 1.114.2.5 2006/11/10 04:36:34 shadow Exp $"); #include "afs/sysincludes.h" /*Standard vendor system headers */ #include "afsincludes.h" /*AFS-based standard headers */ Index: openafs/src/afs/sysincludes.h diff -c openafs/src/afs/sysincludes.h:1.40.2.2 openafs/src/afs/sysincludes.h:1.40.2.3 *** openafs/src/afs/sysincludes.h:1.40.2.2 Wed Sep 6 16:58:47 2006 --- openafs/src/afs/sysincludes.h Thu Nov 9 18:30:52 2006 *************** *** 53,59 **** --- 53,61 ---- #else /* AFS_OBSD_ENV */ #ifdef AFS_LINUX22_ENV #include + #ifdef CONFIG_H_EXISTS #include + #endif #include #include #include Index: openafs/src/afs/AIX/osi_file.c diff -c openafs/src/afs/AIX/osi_file.c:1.9 openafs/src/afs/AIX/osi_file.c:1.9.14.1 *** openafs/src/afs/AIX/osi_file.c:1.9 Tue Jul 15 19:14:16 2003 --- openafs/src/afs/AIX/osi_file.c Thu Nov 9 18:30:52 2006 *************** *** 11,17 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/AIX/osi_file.c,v 1.9 2003/07/15 23:14:16 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ --- 11,17 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/AIX/osi_file.c,v 1.9.14.1 2006/11/09 23:30:52 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ *************** *** 75,81 **** AFS_GLOCK(); if (code == 0) { astat->size = tvattr.va_size; - astat->blksize = tvattr.va_blocksize; astat->mtime = tvattr.va_mtime.tv_sec; astat->atime = tvattr.va_atime.tv_sec; } --- 75,80 ---- Index: openafs/src/afs/DARWIN/osi_file.c diff -c openafs/src/afs/DARWIN/osi_file.c:1.12.2.1 openafs/src/afs/DARWIN/osi_file.c:1.12.2.2 *** openafs/src/afs/DARWIN/osi_file.c:1.12.2.1 Sun Aug 20 18:15:16 2006 --- openafs/src/afs/DARWIN/osi_file.c Thu Nov 9 18:30:53 2006 *************** *** 11,17 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/DARWIN/osi_file.c,v 1.12.2.1 2006/08/20 22:15:16 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ --- 11,17 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/DARWIN/osi_file.c,v 1.12.2.2 2006/11/09 23:30:53 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ *************** *** 202,208 **** AFS_GLOCK(); if (code == 0) { astat->size = tvattr.va_size; - astat->blksize = tvattr.va_blocksize; astat->mtime = tvattr.va_mtime.tv_sec; astat->atime = tvattr.va_atime.tv_sec; } --- 202,207 ---- Index: openafs/src/afs/DARWIN/osi_machdep.h diff -c openafs/src/afs/DARWIN/osi_machdep.h:1.17 openafs/src/afs/DARWIN/osi_machdep.h:1.17.4.1 *** openafs/src/afs/DARWIN/osi_machdep.h:1.17 Thu Dec 1 02:36:35 2005 --- openafs/src/afs/DARWIN/osi_machdep.h Thu Nov 9 19:11:05 2006 *************** *** 128,135 **** extern int hz; #endif - #define PAGESIZE 8192 - #define AFS_UCRED ucred #define AFS_PROC struct proc --- 128,133 ---- Index: openafs/src/afs/FBSD/osi_file.c diff -c openafs/src/afs/FBSD/osi_file.c:1.13 openafs/src/afs/FBSD/osi_file.c:1.13.14.1 *** openafs/src/afs/FBSD/osi_file.c:1.13 Wed Mar 10 18:01:51 2004 --- openafs/src/afs/FBSD/osi_file.c Thu Nov 9 18:30:53 2006 *************** *** 11,17 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/FBSD/osi_file.c,v 1.13 2004/03/10 23:01:51 rees Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ --- 11,17 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/FBSD/osi_file.c,v 1.13.14.1 2006/11/09 23:30:53 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ *************** *** 81,87 **** AFS_GLOCK(); if (code == 0) { astat->size = tvattr.va_size; - astat->blksize = tvattr.va_blocksize; astat->mtime = tvattr.va_mtime.tv_sec; astat->atime = tvattr.va_atime.tv_sec; } --- 81,86 ---- Index: openafs/src/afs/FBSD/osi_machdep.h diff -c openafs/src/afs/FBSD/osi_machdep.h:1.13.4.1 openafs/src/afs/FBSD/osi_machdep.h:1.13.4.2 *** openafs/src/afs/FBSD/osi_machdep.h:1.13.4.1 Mon Jul 31 12:16:52 2006 --- openafs/src/afs/FBSD/osi_machdep.h Thu Nov 9 19:11:06 2006 *************** *** 31,38 **** #define osi_Time() time_second #define afs_hz hz - #define PAGESIZE 8192 - #define AFS_UCRED ucred #define AFS_PROC struct proc --- 31,36 ---- Index: openafs/src/afs/HPUX/osi_file.c diff -c openafs/src/afs/HPUX/osi_file.c:1.8 openafs/src/afs/HPUX/osi_file.c:1.8.14.1 *** openafs/src/afs/HPUX/osi_file.c:1.8 Tue Jul 15 19:14:21 2003 --- openafs/src/afs/HPUX/osi_file.c Thu Nov 9 18:30:53 2006 *************** *** 11,17 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/HPUX/osi_file.c,v 1.8 2003/07/15 23:14:21 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ --- 11,17 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/HPUX/osi_file.c,v 1.8.14.1 2006/11/09 23:30:53 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ *************** *** 75,81 **** AFS_GLOCK(); if (code == 0) { astat->size = tvattr.va_size; - astat->blksize = tvattr.va_blocksize; astat->mtime = tvattr.va_mtime.tv_sec; astat->atime = tvattr.va_atime.tv_sec; } --- 75,80 ---- Index: openafs/src/afs/HPUX/osi_machdep.h diff -c openafs/src/afs/HPUX/osi_machdep.h:1.14 openafs/src/afs/HPUX/osi_machdep.h:1.14.4.1 *** openafs/src/afs/HPUX/osi_machdep.h:1.14 Fri Oct 14 22:03:53 2005 --- openafs/src/afs/HPUX/osi_machdep.h Thu Nov 9 19:11:06 2006 *************** *** 24,34 **** extern struct timeval time; #define osi_Time() (time.tv_sec) - #ifdef PAGESIZE - #undef PAGESIZE - #endif - #define PAGESIZE 8192 - #define AFS_UCRED ucred #define AFS_PROC proc_t --- 24,29 ---- Index: openafs/src/afs/IRIX/osi_file.c diff -c openafs/src/afs/IRIX/osi_file.c:1.11 openafs/src/afs/IRIX/osi_file.c:1.11.14.1 *** openafs/src/afs/IRIX/osi_file.c:1.11 Sun Aug 8 23:25:45 2004 --- openafs/src/afs/IRIX/osi_file.c Thu Nov 9 18:30:53 2006 *************** *** 11,17 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/IRIX/osi_file.c,v 1.11 2004/08/09 03:25:45 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ --- 11,17 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/IRIX/osi_file.c,v 1.11.14.1 2006/11/09 23:30:53 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ *************** *** 106,112 **** AFS_GLOCK(); if (code == 0) { astat->size = tvattr.va_size; - astat->blksize = tvattr.va_blocksize; astat->mtime = tvattr.va_mtime.tv_sec; astat->atime = tvattr.va_atime.tv_sec; } --- 106,111 ---- Index: openafs/src/afs/IRIX/osi_machdep.h diff -c openafs/src/afs/IRIX/osi_machdep.h:1.10.2.1 openafs/src/afs/IRIX/osi_machdep.h:1.10.2.2 *** openafs/src/afs/IRIX/osi_machdep.h:1.10.2.1 Tue Oct 10 18:23:16 2006 --- openafs/src/afs/IRIX/osi_machdep.h Thu Nov 9 19:11:06 2006 *************** *** 207,217 **** #define afs_hz HZ - #ifdef PAGESIZE - #undef PAGESIZE - #endif - #define PAGESIZE 4096 - #ifdef AFS_SGI64_ENV #undef setuerror #undef getuerror --- 207,212 ---- Index: openafs/src/afs/LINUX/osi_file.c diff -c openafs/src/afs/LINUX/osi_file.c:1.28.2.4 openafs/src/afs/LINUX/osi_file.c:1.28.2.5 *** openafs/src/afs/LINUX/osi_file.c:1.28.2.4 Fri Aug 11 17:40:56 2006 --- openafs/src/afs/LINUX/osi_file.c Thu Nov 9 18:30:53 2006 *************** *** 11,17 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/LINUX/osi_file.c,v 1.28.2.4 2006/08/11 21:40:56 shadow Exp $"); #ifdef AFS_LINUX24_ENV #include "h/module.h" /* early to avoid printf->printk mapping */ --- 11,17 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/LINUX/osi_file.c,v 1.28.2.5 2006/11/09 23:30:53 shadow Exp $"); #ifdef AFS_LINUX24_ENV #include "h/module.h" /* early to avoid printf->printk mapping */ *************** *** 138,146 **** AFS_STATCNT(osi_Stat); MObtainWriteLock(&afs_xosi, 320); astat->size = OSIFILE_INODE(afile)->i_size; - #ifdef STRUCT_INODE_HAS_I_BLKSIZE - astat->blksize = OSIFILE_INODE(afile)->i_blksize; - #endif #if defined(AFS_LINUX26_ENV) astat->mtime = OSIFILE_INODE(afile)->i_mtime.tv_sec; astat->atime = OSIFILE_INODE(afile)->i_atime.tv_sec; --- 138,143 ---- Index: openafs/src/afs/LINUX/osi_machdep.h diff -c openafs/src/afs/LINUX/osi_machdep.h:1.34.2.2 openafs/src/afs/LINUX/osi_machdep.h:1.34.2.3 *** openafs/src/afs/LINUX/osi_machdep.h:1.34.2.2 Sat Sep 16 15:16:55 2006 --- openafs/src/afs/LINUX/osi_machdep.h Thu Nov 9 19:11:06 2006 *************** *** 123,129 **** #define uprintf printk - #define PAGESIZE PAGE_SIZE #ifndef NGROUPS #define NGROUPS NGROUPS_SMALL #endif --- 123,128 ---- Index: openafs/src/afs/LINUX/osi_probe.c diff -c openafs/src/afs/LINUX/osi_probe.c:1.11.2.3 openafs/src/afs/LINUX/osi_probe.c:1.11.2.5 *** openafs/src/afs/LINUX/osi_probe.c:1.11.2.3 Fri Oct 6 10:02:56 2006 --- openafs/src/afs/LINUX/osi_probe.c Thu Nov 9 18:12:51 2006 *************** *** 59,65 **** --- 59,67 ---- #include "afsincludes.h" #endif #include + #ifdef CONFIG_H_EXISTS #include + #endif #include #include #include *************** *** 1010,1016 **** ptr = aptr; #endif if ((unsigned long)ptr < init_mm.start_code || ! (unsigned long)ptr > init_mm.end_data) { /* printk("address 0x%lx (from 0x%lx %d) is out of range in check_table. wtf?\n", (unsigned long)x, (unsigned long)ptr, i);*/ continue; } --- 1012,1023 ---- ptr = aptr; #endif if ((unsigned long)ptr < init_mm.start_code || ! #if defined(AFS_AMD64_LINUX20_ENV) ! (unsigned long)ptr > init_mm.brk) ! #else ! (unsigned long)ptr > init_mm.end_data) ! #endif ! { /* printk("address 0x%lx (from 0x%lx %d) is out of range in check_table. wtf?\n", (unsigned long)x, (unsigned long)ptr, i);*/ continue; } *************** *** 1119,1126 **** printk("<7>osi_probe: %s try_harder\n", P->symbol); #endif for (offset = 0; offset < datalen; offset++, ptr++) { ! if ((unsigned long)ptr < init_mm.start_code || ! (unsigned long)ptr > init_mm.end_data) { /* printk("address 0x%lx (from 0x%lx %d) is out of range in check_table. wtf?\n", (unsigned long)x, (unsigned long)ptr, i);*/ continue; } --- 1126,1138 ---- printk("<7>osi_probe: %s try_harder\n", P->symbol); #endif for (offset = 0; offset < datalen; offset++, ptr++) { ! if ((unsigned long)ptr < init_mm.start_code || ! #if defined(AFS_AMD64_LINUX20_ENV) ! (unsigned long)ptr > init_mm.brk) ! #else ! (unsigned long)ptr > init_mm.end_data) ! #endif ! { /* printk("address 0x%lx (from 0x%lx %d) is out of range in check_table. wtf?\n", (unsigned long)x, (unsigned long)ptr, i);*/ continue; } Index: openafs/src/afs/LINUX/osi_sysctl.c diff -c openafs/src/afs/LINUX/osi_sysctl.c:1.9 openafs/src/afs/LINUX/osi_sysctl.c:1.9.2.1 *** openafs/src/afs/LINUX/osi_sysctl.c:1.9 Wed Apr 5 12:04:34 2006 --- openafs/src/afs/LINUX/osi_sysctl.c Thu Nov 9 18:12:51 2006 *************** *** 1,7 **** /* * osi_sysctl.c: Linux sysctl interface to OpenAFS * ! * $Id: osi_sysctl.c,v 1.9 2006/04/05 16:04:34 shadow Exp $ * * Written Jan 30, 2002 by Kris Van Hees (Sine Nomine Associates) */ --- 1,7 ---- /* * osi_sysctl.c: Linux sysctl interface to OpenAFS * ! * $Id: osi_sysctl.c,v 1.9.2.1 2006/11/09 23:12:51 shadow Exp $ * * Written Jan 30, 2002 by Kris Van Hees (Sine Nomine Associates) */ *************** *** 14,20 **** --- 14,22 ---- #include "afs/afs_stats.h" /* afs statistics */ #include + #ifdef CONFIG_H_EXISTS #include + #endif /* From afs_util.c */ extern afs_int32 afs_new_inum; Index: openafs/src/afs/LINUX/osi_vfsops.c diff -c openafs/src/afs/LINUX/osi_vfsops.c:1.42.4.9 openafs/src/afs/LINUX/osi_vfsops.c:1.42.4.12 *** openafs/src/afs/LINUX/osi_vfsops.c:1.42.4.9 Fri Oct 6 09:29:16 2006 --- openafs/src/afs/LINUX/osi_vfsops.c Thu Nov 9 19:11:06 2006 *************** *** 16,22 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/LINUX/osi_vfsops.c,v 1.42.4.9 2006/10/06 13:29:16 shadow Exp $"); #define __NO_VERSION__ /* don't define kernel_version in module.h */ #include /* early to avoid printf->printk mapping */ --- 16,22 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/LINUX/osi_vfsops.c,v 1.42.4.12 2006/11/10 00:11:06 shadow Exp $"); #define __NO_VERSION__ /* don't define kernel_version in module.h */ #include /* early to avoid printf->printk mapping */ *************** *** 67,77 **** * dev, covered, s_rd_only, s_dirt, and s_type will be set by read_super. */ #if defined(AFS_LINUX26_ENV) - static struct super_block * #ifdef GET_SB_HAS_STRUCT_VFSMOUNT afs_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data, struct vfsmount *mnt) #else afs_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data) #endif --- 67,78 ---- * dev, covered, s_rd_only, s_dirt, and s_type will be set by read_super. */ #if defined(AFS_LINUX26_ENV) #ifdef GET_SB_HAS_STRUCT_VFSMOUNT + int afs_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data, struct vfsmount *mnt) #else + static struct superblock * afs_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data) #endif *************** *** 105,112 **** #if defined(AFS_LINUX26_ENV) struct backing_dev_info afs_backing_dev_info = { ! .ra_pages = (VM_MAX_READAHEAD * 1024) / PAGE_CACHE_SIZE, ! .state = 0, }; int --- 106,112 ---- #if defined(AFS_LINUX26_ENV) struct backing_dev_info afs_backing_dev_info = { ! .ra_pages = 0, /* disable readahead, afs does prefetch */ }; int *************** *** 391,397 **** --- 391,401 ---- */ #if defined(AFS_LINUX26_ENV) int + #if defined(STATFS_TAKES_DENTRY) + afs_statfs(struct dentry *dentry, struct kstatfs *statp) + #else afs_statfs(struct super_block *sbp, struct kstatfs *statp) + #endif #elif defined(AFS_LINUX24_ENV) int afs_statfs(struct super_block *sbp, struct statfs *statp) *************** *** 415,421 **** --- 419,429 ---- AFS_STATCNT(afs_statfs); statp->f_type = 0; /* Can we get a real type sometime? */ + #if defined(STATFS_TAKES_DENTRY) + statp->f_bsize = dentry->d_sb->s_blocksize; + #else statp->f_bsize = sbp->s_blocksize; + #endif statp->f_blocks = statp->f_bfree = statp->f_bavail = statp->f_files = statp->f_ffree = 9000000; statp->f_fsid.val[0] = AFS_VFSMAGIC; *************** *** 493,498 **** --- 501,509 ---- ip->i_ino = vp->va_nodeid; ip->i_nlink = vp->va_nlink; ip->i_blocks = vp->va_blocks; + #ifdef STRUCT_INODE_HAS_I_BLKBITS + ip->i_blkbits = AFS_BLKBITS; + #endif #ifdef STRUCT_INODE_HAS_I_BLKSIZE ip->i_blksize = vp->va_blocksize; #endif Index: openafs/src/afs/LINUX/osi_vnodeops.c diff -c openafs/src/afs/LINUX/osi_vnodeops.c:1.126.2.7 openafs/src/afs/LINUX/osi_vnodeops.c:1.126.2.8 *** openafs/src/afs/LINUX/osi_vnodeops.c:1.126.2.7 Tue Oct 10 18:02:42 2006 --- openafs/src/afs/LINUX/osi_vnodeops.c Thu Nov 9 19:11:06 2006 *************** *** 22,28 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/LINUX/osi_vnodeops.c,v 1.126.2.7 2006/10/10 22:02:42 shadow Exp $"); #include "afs/sysincludes.h" #include "afsincludes.h" --- 22,28 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/LINUX/osi_vnodeops.c,v 1.126.2.8 2006/11/10 00:11:06 shadow Exp $"); #include "afs/sysincludes.h" #include "afsincludes.h" *************** *** 1347,1353 **** clear_bit(PG_error, &pp->flags); #endif ! setup_uio(&tuio, &iovec, (char *)address, offset, PAGESIZE, UIO_READ, AFS_UIOSYS); #ifdef AFS_LINUX24_ENV lock_kernel(); --- 1347,1353 ---- clear_bit(PG_error, &pp->flags); #endif ! setup_uio(&tuio, &iovec, (char *)address, offset, PAGE_SIZE, UIO_READ, AFS_UIOSYS); #ifdef AFS_LINUX24_ENV lock_kernel(); *************** *** 1365,1371 **** if (!code) { if (tuio.uio_resid) /* zero remainder of page */ ! memset((void *)(address + (PAGESIZE - tuio.uio_resid)), 0, tuio.uio_resid); #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0) flush_dcache_page(pp); --- 1365,1371 ---- if (!code) { if (tuio.uio_resid) /* zero remainder of page */ ! memset((void *)(address + (PAGE_SIZE - tuio.uio_resid)), 0, tuio.uio_resid); #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0) flush_dcache_page(pp); Index: openafs/src/afs/NBSD/osi_file.c diff -c openafs/src/afs/NBSD/osi_file.c:1.5 openafs/src/afs/NBSD/osi_file.c:1.5.14.1 *** openafs/src/afs/NBSD/osi_file.c:1.5 Wed Aug 27 17:43:18 2003 --- openafs/src/afs/NBSD/osi_file.c Thu Nov 9 18:30:54 2006 *************** *** 11,17 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/NBSD/osi_file.c,v 1.5 2003/08/27 21:43:18 rees Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ --- 11,17 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/NBSD/osi_file.c,v 1.5.14.1 2006/11/09 23:30:54 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ *************** *** 67,73 **** AFS_GLOCK(); if (code == 0) { astat->size = tvattr.va_size; - astat->blksize = tvattr.va_blocksize; astat->mtime = tvattr.va_mtime.tv_sec; astat->atime = tvattr.va_atime.tv_sec; } --- 67,72 ---- Index: openafs/src/afs/NBSD/osi_machdep.h diff -c openafs/src/afs/NBSD/osi_machdep.h:1.3 openafs/src/afs/NBSD/osi_machdep.h:1.3.4.1 *** openafs/src/afs/NBSD/osi_machdep.h:1.3 Thu Jan 26 11:00:39 2006 --- openafs/src/afs/NBSD/osi_machdep.h Thu Nov 9 19:11:07 2006 *************** *** 32,39 **** #define osi_Time() (time.tv_sec) #define afs_hz hz - #define PAGESIZE 8192 - #define AFS_UCRED ucred #define AFS_PROC struct proc --- 32,37 ---- Index: openafs/src/afs/OBSD/osi_file.c diff -c openafs/src/afs/OBSD/osi_file.c:1.11 openafs/src/afs/OBSD/osi_file.c:1.11.2.1 *** openafs/src/afs/OBSD/osi_file.c:1.11 Thu Mar 9 10:27:17 2006 --- openafs/src/afs/OBSD/osi_file.c Thu Nov 9 18:30:54 2006 *************** *** 11,17 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/OBSD/osi_file.c,v 1.11 2006/03/09 15:27:17 rees Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afs/afsincludes.h" /* Afs-based standard headers */ --- 11,17 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/OBSD/osi_file.c,v 1.11.2.1 2006/11/09 23:30:54 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afs/afsincludes.h" /* Afs-based standard headers */ *************** *** 72,78 **** AFS_GLOCK(); if (code == 0) { astat->size = afile->size = tvattr.va_size; - astat->blksize = tvattr.va_blocksize; astat->mtime = tvattr.va_mtime.tv_sec; astat->atime = tvattr.va_atime.tv_sec; } --- 72,77 ---- Index: openafs/src/afs/OBSD/osi_machdep.h diff -c openafs/src/afs/OBSD/osi_machdep.h:1.27 openafs/src/afs/OBSD/osi_machdep.h:1.27.2.1 *** openafs/src/afs/OBSD/osi_machdep.h:1.27 Mon Mar 13 11:26:27 2006 --- openafs/src/afs/OBSD/osi_machdep.h Thu Nov 9 19:11:07 2006 *************** *** 16,22 **** * afs_osi.h. */ ! /* $Id: osi_machdep.h,v 1.27 2006/03/13 16:26:27 rees Exp $ */ #ifndef _OSI_MACHDEP_H_ #define _OSI_MACHDEP_H_ --- 16,22 ---- * afs_osi.h. */ ! /* $Id: osi_machdep.h,v 1.27.2.1 2006/11/10 00:11:07 shadow Exp $ */ #ifndef _OSI_MACHDEP_H_ #define _OSI_MACHDEP_H_ *************** *** 85,91 **** #ifndef iodone #define iodone biodone #endif - #define PAGESIZE 8192 #define printk printf /* for RX version of xdr_* */ #define setgroups sys_setgroups #define UVM --- 85,90 ---- Index: openafs/src/afs/SOLARIS/osi_file.c diff -c openafs/src/afs/SOLARIS/osi_file.c:1.13 openafs/src/afs/SOLARIS/osi_file.c:1.13.14.1 *** openafs/src/afs/SOLARIS/osi_file.c:1.13 Thu Jun 24 13:38:24 2004 --- openafs/src/afs/SOLARIS/osi_file.c Thu Nov 9 18:30:54 2006 *************** *** 11,17 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/SOLARIS/osi_file.c,v 1.13 2004/06/24 17:38:24 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ --- 11,17 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/SOLARIS/osi_file.c,v 1.13.14.1 2006/11/09 23:30:54 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ *************** *** 228,234 **** AFS_GLOCK(); if (code == 0) { astat->size = tvattr.va_size; - astat->blksize = tvattr.va_blksize; astat->mtime = tvattr.va_mtime.tv_sec; astat->atime = tvattr.va_atime.tv_sec; } --- 228,233 ---- Index: openafs/src/afs/UKERNEL/afs_usrops.c diff -c openafs/src/afs/UKERNEL/afs_usrops.c:1.30.6.3 openafs/src/afs/UKERNEL/afs_usrops.c:1.30.6.4 *** openafs/src/afs/UKERNEL/afs_usrops.c:1.30.6.3 Mon Jul 31 17:27:40 2006 --- openafs/src/afs/UKERNEL/afs_usrops.c Thu Nov 9 23:05:31 2006 *************** *** 15,21 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/UKERNEL/afs_usrops.c,v 1.30.6.3 2006/07/31 21:27:40 shadow Exp $"); #ifdef UKERNEL --- 15,21 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/UKERNEL/afs_usrops.c,v 1.30.6.4 2006/11/10 04:05:31 shadow Exp $"); #ifdef UKERNEL *************** *** 854,860 **** return -1; } stp->size = st.st_size; - stp->blksize = st.st_blksize; stp->mtime = st.st_mtime; stp->atime = st.st_atime; AFS_GLOCK(); --- 854,859 ---- Index: openafs/src/afs/UKERNEL/sysincludes.h diff -c openafs/src/afs/UKERNEL/sysincludes.h:1.15.14.1 openafs/src/afs/UKERNEL/sysincludes.h:1.15.14.2 *** openafs/src/afs/UKERNEL/sysincludes.h:1.15.14.1 Wed Sep 27 17:15:59 2006 --- openafs/src/afs/UKERNEL/sysincludes.h Thu Nov 9 19:11:08 2006 *************** *** 175,184 **** #define MAXNAMLEN 512 #endif - #ifndef PAGESIZE - #define PAGESIZE 4096 - #endif - /* * This file contains data types and definitions for running * the AFS client in user space. Kernel data structures --- 175,180 ---- Index: openafs/src/afs/VNOPS/afs_vnop_attrs.c diff -c openafs/src/afs/VNOPS/afs_vnop_attrs.c:1.41 openafs/src/afs/VNOPS/afs_vnop_attrs.c:1.41.2.1 *** openafs/src/afs/VNOPS/afs_vnop_attrs.c:1.41 Wed Apr 5 12:04:37 2006 --- openafs/src/afs/VNOPS/afs_vnop_attrs.c Thu Nov 9 19:11:08 2006 *************** *** 24,30 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/VNOPS/afs_vnop_attrs.c,v 1.41 2006/04/05 16:04:37 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ --- 24,30 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/VNOPS/afs_vnop_attrs.c,v 1.41.2.1 2006/11/10 00:11:08 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ *************** *** 147,155 **** attrs->va_flags = 0; #endif #if defined(AFS_SGI_ENV) || defined(AFS_SUN5_ENV) ! attrs->va_blksize = PAGESIZE; /* XXX Was 8192 XXX */ #else ! attrs->va_blocksize = PAGESIZE; /* XXX Was 8192 XXX */ #endif attrs->va_rdev = 1; #if defined(AFS_HPUX110_ENV) --- 147,155 ---- attrs->va_flags = 0; #endif #if defined(AFS_SGI_ENV) || defined(AFS_SUN5_ENV) ! attrs->va_blksize = AFS_BLKSIZE; /* XXX Was 8192 XXX */ #else ! attrs->va_blocksize = AFS_BLKSIZE; /* XXX Was 8192 XXX */ #endif attrs->va_rdev = 1; #if defined(AFS_HPUX110_ENV) Index: openafs/src/bozo/bnode.c diff -c openafs/src/bozo/bnode.c:1.19.2.1 openafs/src/bozo/bnode.c:1.19.2.2 *** openafs/src/bozo/bnode.c:1.19.2.1 Sun Aug 13 16:18:17 2006 --- openafs/src/bozo/bnode.c Wed Nov 8 21:16:23 2006 *************** *** 11,17 **** #include RCSID ! ("$Header: /cvs/openafs/src/bozo/bnode.c,v 1.19.2.1 2006/08/13 20:18:17 shadow Exp $"); #include #include --- 11,17 ---- #include RCSID ! ("$Header: /cvs/openafs/src/bozo/bnode.c,v 1.19.2.2 2006/11/09 02:16:23 shadow Exp $"); #include #include *************** *** 912,919 **** tp = (struct bnode_proc *)malloc(sizeof(struct bnode_proc)); memset(tp, 0, sizeof(struct bnode_proc)); tp->next = allProcs; - allProcs = tp; - *aproc = tp; tp->bnode = abnode; tp->comLine = aexecString; tp->coreName = coreName; /* may be null */ --- 912,917 ---- *************** *** 937,942 **** --- 935,942 ---- } bnode_FreeTokens(tlist); + allProcs = tp; + *aproc = tp; tp->pid = cpid; tp->flags = BPROC_STARTED; tp->flags &= ~BPROC_EXITED; Index: openafs/src/cf/linux-test3.m4 diff -c openafs/src/cf/linux-test3.m4:1.18.4.1 openafs/src/cf/linux-test3.m4:1.18.4.2 *** openafs/src/cf/linux-test3.m4:1.18.4.1 Fri Aug 4 11:45:33 2006 --- openafs/src/cf/linux-test3.m4 Thu Nov 9 18:12:51 2006 *************** *** 33,38 **** --- 33,41 ---- AC_SUBST(RHCONFIG_MP) ]) + + dnl This depends on LINUX_CONFIG_H_EXISTS running first! + AC_DEFUN([LINUX_WHICH_MODULES],[ if test "x$enable_redhat_buildsys" = "xyes"; then MPS=Default *************** *** 40,51 **** save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="-I${LINUX_KERNEL_PATH}/include -D__KERNEL__ $RHCONFIG_SP $CPPFLAGS" AC_MSG_CHECKING(which kernel modules to build) if test "x$ac_linux_rhconfig" = "xyes"; then MPS="MP SP" else AC_CACHE_VAL(ac_cv_linux_config_smp, [ ! AC_TRY_COMPILE( ! [#include ], [#ifndef CONFIG_SMP lose; --- 43,59 ---- save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="-I${LINUX_KERNEL_PATH}/include -D__KERNEL__ $RHCONFIG_SP $CPPFLAGS" AC_MSG_CHECKING(which kernel modules to build) + if test "x$ac_cv_linux_config_h_exists" = "xyes"; then + CPPFLAGS="-DCONFIG_H_EXISTS $CPPFLAGS" + fi if test "x$ac_linux_rhconfig" = "xyes"; then MPS="MP SP" else AC_CACHE_VAL(ac_cv_linux_config_smp, [ ! AC_TRY_KBUILD( ! [#ifdef CONFIG_H_EXISTS ! #include ! #endif ], [#ifndef CONFIG_SMP lose; Index: openafs/src/cf/linux-test4.m4 diff -c openafs/src/cf/linux-test4.m4:1.29.2.10 openafs/src/cf/linux-test4.m4:1.29.2.13 *** openafs/src/cf/linux-test4.m4:1.29.2.10 Wed Oct 11 22:58:05 2006 --- openafs/src/cf/linux-test4.m4 Thu Nov 9 19:11:09 2006 *************** *** 1,3 **** --- 1,17 ---- + AC_DEFUN([LINUX_CONFIG_H_EXISTS], [ + AC_MSG_CHECKING([for linux/config.h existance]) + AC_CACHE_VAL([ac_cv_linux_config_h_exists], [ + AC_TRY_KBUILD( + [#include ], + [return;], + ac_cv_linux_config_h_exists=yes, + ac_cv_linux_config_h_exists=no)]) + AC_MSG_RESULT($ac_cv_linux_config_h_exists) + if test "x$ac_cv_linux_config_h_exists" = "xyes"; then + AC_DEFINE([CONFIG_H_EXISTS], 1, [define if linux/config.h exists]) + fi]) + + AC_DEFUN([LINUX_COMPLETION_H_EXISTS], [ AC_MSG_CHECKING([for linux/completion.h existance]) AC_CACHE_VAL([ac_cv_linux_completion_h_exists], [ *************** *** 162,167 **** --- 176,196 ---- ac_cv_linux_fs_struct_inode_has_i_blksize=no)]) AC_MSG_RESULT($ac_cv_linux_fs_struct_inode_has_i_blksize)]) + AC_DEFUN([LINUX_FS_STRUCT_INODE_HAS_I_BLKBITS], [ + AC_MSG_CHECKING([for i_blkbits in struct inode]) + AC_CACHE_VAL([ac_cv_linux_fs_struct_inode_has_i_blkbits], [ + AC_TRY_KBUILD( + [#include ], + [struct inode _inode; + printk("%d\n", _inode.i_blkbits);], + ac_cv_linux_fs_struct_inode_has_i_blkbits=yes, + ac_cv_linux_fs_struct_inode_has_i_blkbits=no)]) + AC_MSG_RESULT($ac_cv_linux_fs_struct_inode_has_i_blkbits) + if test "x$ac_cv_linux_fs_struct_inode_has_i_blkbits" = "xyes"; then + AC_DEFINE(STRUCT_INODE_HAS_I_BLKBITS, 1, [define if your struct inode has i_blkbits]) + fi]) + + AC_DEFUN([LINUX_FS_STRUCT_INODE_HAS_I_CDEV], [ AC_MSG_CHECKING([for i_cdev in struct inode]) AC_CACHE_VAL([ac_cv_linux_fs_struct_inode_has_i_cdev], [ *************** *** 608,613 **** --- 637,655 ---- ac_cv_linux_get_sb_has_struct_vfsmount=no)]) AC_MSG_RESULT($ac_cv_linux_get_sb_has_struct_vfsmount)]) + AC_DEFUN([LINUX_STATFS_TAKES_DENTRY], [ + AC_MSG_CHECKING([for dentry in statfs]) + AC_CACHE_VAL([ac_cv_linux_statfs_takes_dentry], [ + AC_TRY_KBUILD( + [#include + #include ], + [ + extern int vfs_statfs(struct dentry *, struct kstatfs *); + ], + ac_cv_linux_statfs_takes_dentry=yes, + ac_cv_linux_statfs_takes_dentry=no)]) + AC_MSG_RESULT($ac_cv_linux_statfs_takes_dentry)]) + AC_DEFUN([LINUX_LINUX_KEYRING_SUPPORT], [ AC_MSG_CHECKING([for linux kernel keyring support]) AC_CACHE_VAL([ac_cv_linux_keyring_support], [ Index: openafs/src/config/NTMakefile.amd64_w2k diff -c openafs/src/config/NTMakefile.amd64_w2k:1.24.2.11 openafs/src/config/NTMakefile.amd64_w2k:1.24.2.12 *** openafs/src/config/NTMakefile.amd64_w2k:1.24.2.11 Sat Oct 21 16:55:41 2006 --- openafs/src/config/NTMakefile.amd64_w2k Thu Nov 9 16:29:21 2006 *************** *** 84,90 **** #define used in WinNT/2000 installation and program version display AFSPRODUCT_VER_MAJOR=1 AFSPRODUCT_VER_MINOR=5 ! AFSPRODUCT_VER_PATCH=1000 AFSPRODUCT_VER_BUILD=0 AFSPRODUCT_VERSION=$(AFSPRODUCT_VER_MAJOR).$(AFSPRODUCT_VER_MINOR).$(AFSPRODUCT_VER_PATCH) --- 84,90 ---- #define used in WinNT/2000 installation and program version display AFSPRODUCT_VER_MAJOR=1 AFSPRODUCT_VER_MINOR=5 ! AFSPRODUCT_VER_PATCH=1100 AFSPRODUCT_VER_BUILD=0 AFSPRODUCT_VERSION=$(AFSPRODUCT_VER_MAJOR).$(AFSPRODUCT_VER_MINOR).$(AFSPRODUCT_VER_PATCH) Index: openafs/src/config/NTMakefile.i386_nt40 diff -c openafs/src/config/NTMakefile.i386_nt40:1.84.2.11 openafs/src/config/NTMakefile.i386_nt40:1.84.2.12 *** openafs/src/config/NTMakefile.i386_nt40:1.84.2.11 Sat Oct 21 16:55:41 2006 --- openafs/src/config/NTMakefile.i386_nt40 Thu Nov 9 16:29:21 2006 *************** *** 84,90 **** #define used in WinNT/2000 installation and program version display AFSPRODUCT_VER_MAJOR=1 AFSPRODUCT_VER_MINOR=5 ! AFSPRODUCT_VER_PATCH=1000 AFSPRODUCT_VER_BUILD=0 AFSPRODUCT_VERSION=$(AFSPRODUCT_VER_MAJOR).$(AFSPRODUCT_VER_MINOR).$(AFSPRODUCT_VER_PATCH) --- 84,90 ---- #define used in WinNT/2000 installation and program version display AFSPRODUCT_VER_MAJOR=1 AFSPRODUCT_VER_MINOR=5 ! AFSPRODUCT_VER_PATCH=1100 AFSPRODUCT_VER_BUILD=0 AFSPRODUCT_VERSION=$(AFSPRODUCT_VER_MAJOR).$(AFSPRODUCT_VER_MINOR).$(AFSPRODUCT_VER_PATCH) Index: openafs/src/config/NTMakefile.i386_w2k diff -c openafs/src/config/NTMakefile.i386_w2k:1.23.2.11 openafs/src/config/NTMakefile.i386_w2k:1.23.2.12 *** openafs/src/config/NTMakefile.i386_w2k:1.23.2.11 Sat Oct 21 16:55:41 2006 --- openafs/src/config/NTMakefile.i386_w2k Thu Nov 9 16:29:21 2006 *************** *** 84,90 **** #define used in WinNT/2000 installation and program version display AFSPRODUCT_VER_MAJOR=1 AFSPRODUCT_VER_MINOR=5 ! AFSPRODUCT_VER_PATCH=1000 AFSPRODUCT_VER_BUILD=0 AFSPRODUCT_VERSION=$(AFSPRODUCT_VER_MAJOR).$(AFSPRODUCT_VER_MINOR).$(AFSPRODUCT_VER_PATCH) --- 84,90 ---- #define used in WinNT/2000 installation and program version display AFSPRODUCT_VER_MAJOR=1 AFSPRODUCT_VER_MINOR=5 ! AFSPRODUCT_VER_PATCH=1100 AFSPRODUCT_VER_BUILD=0 AFSPRODUCT_VERSION=$(AFSPRODUCT_VER_MAJOR).$(AFSPRODUCT_VER_MINOR).$(AFSPRODUCT_VER_PATCH) Index: openafs/src/config/param.alpha_linux_22.h diff -c openafs/src/config/param.alpha_linux_22.h:1.7 openafs/src/config/param.alpha_linux_22.h:1.7.6.1 *** openafs/src/config/param.alpha_linux_22.h:1.7 Wed Apr 27 17:43:24 2005 --- openafs/src/config/param.alpha_linux_22.h Thu Nov 9 18:18:45 2006 *************** *** 30,36 **** #define AFS_64BITPOINTER_ENV 1 /* pointers are 64 bits. */ #if defined(__KERNEL__) && !defined(KDUMP_KERNEL) - #include #ifdef CONFIG_SMP #undef CONFIG_SMP #endif --- 30,35 ---- Index: openafs/src/config/param.alpha_linux_24.h diff -c openafs/src/config/param.alpha_linux_24.h:1.7.6.1 openafs/src/config/param.alpha_linux_24.h:1.7.6.2 *** openafs/src/config/param.alpha_linux_24.h:1.7.6.1 Mon Jun 12 12:25:47 2006 --- openafs/src/config/param.alpha_linux_24.h Thu Nov 9 18:18:45 2006 *************** *** 32,38 **** #define AFS_64BITPOINTER_ENV 1 /* pointers are 64 bits. */ #if defined(__KERNEL__) && !defined(KDUMP_KERNEL) - #include #ifdef CONFIG_SMP #undef CONFIG_SMP #endif --- 32,37 ---- Index: openafs/src/config/param.alpha_linux_26.h diff -c openafs/src/config/param.alpha_linux_26.h:1.3.6.4 openafs/src/config/param.alpha_linux_26.h:1.3.6.5 *** openafs/src/config/param.alpha_linux_26.h:1.3.6.4 Mon Jul 31 17:27:40 2006 --- openafs/src/config/param.alpha_linux_26.h Thu Nov 9 18:18:45 2006 *************** *** 35,43 **** #if defined(__KERNEL__) && !defined(KDUMP_KERNEL) - #include - #include #ifdef CONFIG_SMP #ifndef AFS_SMP #define AFS_SMP 1 --- 35,41 ---- Index: openafs/src/config/param.amd64_linux24.h diff -c openafs/src/config/param.amd64_linux24.h:1.5.6.1 openafs/src/config/param.amd64_linux24.h:1.5.6.2 *** openafs/src/config/param.amd64_linux24.h:1.5.6.1 Mon Jun 12 12:25:47 2006 --- openafs/src/config/param.amd64_linux24.h Thu Nov 9 18:18:45 2006 *************** *** 41,49 **** #define AFS_64BITPOINTER_ENV 1 /* pointers are 64 bits. */ #if defined(__KERNEL__) && !defined(KDUMP_KERNEL) - #include - #include #ifdef CONFIG_SMP #undef CONFIG_SMP #endif --- 41,47 ---- *************** *** 89,95 **** #endif #endif /* KERNEL */ - #define USE_UCONTEXT /* should be in afsconfig.h */ #endif /* _PARAM_AMD64_LINUX20_H_ */ --- 87,92 ---- *************** *** 160,166 **** #define CMSERVERPREF #endif - #define USE_UCONTEXT /* should be in afsconfig.h */ #endif /* AFS_PARAM_H */ --- 157,162 ---- Index: openafs/src/config/param.amd64_linux26.h diff -c openafs/src/config/param.amd64_linux26.h:1.4.6.4 openafs/src/config/param.amd64_linux26.h:1.4.6.5 *** openafs/src/config/param.amd64_linux26.h:1.4.6.4 Mon Jul 31 17:27:40 2006 --- openafs/src/config/param.amd64_linux26.h Thu Nov 9 18:18:45 2006 *************** *** 30,38 **** #define AFS_64BITPOINTER_ENV 1 /* pointers are 64 bits */ #if defined(__KERNEL__) && !defined(KDUMP_KERNEL) - #include - #include #ifdef CONFIG_SMP #ifndef AFS_SMP #define AFS_SMP 1 --- 30,36 ---- Index: openafs/src/config/param.i386_linux22.h diff -c openafs/src/config/param.i386_linux22.h:1.17 openafs/src/config/param.i386_linux22.h:1.17.6.1 *** openafs/src/config/param.i386_linux22.h:1.17 Wed Apr 27 17:43:24 2005 --- openafs/src/config/param.i386_linux22.h Thu Nov 9 18:18:45 2006 *************** *** 32,38 **** #define AFS_NAMEI_ENV 1 /* User space interface to file system */ #if defined(__KERNEL__) && !defined(KDUMP_KERNEL) - #include #ifdef CONFIG_SMP #undef CONFIG_SMP #endif --- 32,37 ---- Index: openafs/src/config/param.i386_linux24.h diff -c openafs/src/config/param.i386_linux24.h:1.21.6.1 openafs/src/config/param.i386_linux24.h:1.21.6.2 *** openafs/src/config/param.i386_linux24.h:1.21.6.1 Mon Jun 12 12:25:47 2006 --- openafs/src/config/param.i386_linux24.h Thu Nov 9 18:18:45 2006 *************** *** 27,35 **** #define AFS_64BIT_CLIENT 1 #if defined(__KERNEL__) && !defined(KDUMP_KERNEL) - #include - #include #ifdef CONFIG_SMP #undef CONFIG_SMP #endif --- 27,33 ---- Index: openafs/src/config/param.i386_linux26.h diff -c openafs/src/config/param.i386_linux26.h:1.8.2.4 openafs/src/config/param.i386_linux26.h:1.8.2.5 *** openafs/src/config/param.i386_linux26.h:1.8.2.4 Mon Jul 31 17:27:40 2006 --- openafs/src/config/param.i386_linux26.h Thu Nov 9 18:18:45 2006 *************** *** 28,36 **** #define AFS_64BIT_CLIENT 1 #if defined(__KERNEL__) && !defined(KDUMP_KERNEL) - #include - #include #ifdef CONFIG_SMP #ifndef AFS_SMP #define AFS_SMP 1 --- 28,34 ---- Index: openafs/src/config/param.i386_umlinux22.h diff -c openafs/src/config/param.i386_umlinux22.h:1.4 openafs/src/config/param.i386_umlinux22.h:1.4.6.1 *** openafs/src/config/param.i386_umlinux22.h:1.4 Wed Apr 27 17:43:24 2005 --- openafs/src/config/param.i386_umlinux22.h Thu Nov 9 18:18:45 2006 *************** *** 34,40 **** #define AFS_NAMEI_ENV 1 /* User space interface to file system */ #if defined(__KERNEL__) && !defined(KDUMP_KERNEL) - #include #ifdef CONFIG_SMP #undef CONFIG_SMP #endif --- 34,39 ---- Index: openafs/src/config/param.i386_umlinux24.h diff -c openafs/src/config/param.i386_umlinux24.h:1.4.6.1 openafs/src/config/param.i386_umlinux24.h:1.4.6.2 *** openafs/src/config/param.i386_umlinux24.h:1.4.6.1 Mon Jun 12 12:25:47 2006 --- openafs/src/config/param.i386_umlinux24.h Thu Nov 9 18:18:45 2006 *************** *** 35,43 **** #if defined(__KERNEL__) && !defined(KDUMP_KERNEL) - #include - #include #ifdef CONFIG_SMP #undef CONFIG_SMP #endif --- 35,41 ---- Index: openafs/src/config/param.i386_umlinux26.h diff -c openafs/src/config/param.i386_umlinux26.h:1.3.6.4 openafs/src/config/param.i386_umlinux26.h:1.3.6.5 *** openafs/src/config/param.i386_umlinux26.h:1.3.6.4 Mon Jul 31 17:27:40 2006 --- openafs/src/config/param.i386_umlinux26.h Thu Nov 9 18:18:45 2006 *************** *** 28,36 **** #define AFS_64BIT_CLIENT 1 #if defined(__KERNEL__) && !defined(KDUMP_KERNEL) - #include - #include #ifdef CONFIG_SMP #ifndef AFS_SMP #define AFS_SMP 1 --- 28,34 ---- Index: openafs/src/config/param.ia64_linux24.h diff -c openafs/src/config/param.ia64_linux24.h:1.11.6.1 openafs/src/config/param.ia64_linux24.h:1.11.6.2 *** openafs/src/config/param.ia64_linux24.h:1.11.6.1 Mon Jun 12 12:25:48 2006 --- openafs/src/config/param.ia64_linux24.h Thu Nov 9 18:18:45 2006 *************** *** 41,49 **** #define AFS_64BITPOINTER_ENV 1 /* pointers are 64 bits. */ #if defined(__KERNEL__) && !defined(KDUMP_KERNEL) - #include - #include #ifdef CONFIG_SMP #undef CONFIG_SMP #endif --- 41,47 ---- *************** *** 89,95 **** #endif #endif /* KERNEL */ - #define USE_UCONTEXT /* should be in afsconfig.h */ #endif /* _PARAM_IA64_LINUX20_H_ */ --- 87,92 ---- *************** *** 160,166 **** #define CMSERVERPREF #endif - #define USE_UCONTEXT /* should be in afsconfig.h */ #endif /* AFS_PARAM_H */ --- 157,162 ---- Index: openafs/src/config/param.ia64_linux26.h diff -c openafs/src/config/param.ia64_linux26.h:1.4.6.4 openafs/src/config/param.ia64_linux26.h:1.4.6.5 *** openafs/src/config/param.ia64_linux26.h:1.4.6.4 Mon Jul 31 17:27:40 2006 --- openafs/src/config/param.ia64_linux26.h Thu Nov 9 18:18:45 2006 *************** *** 45,53 **** #include #include #include - #include - #include #ifdef CONFIG_SMP #ifndef AFS_SMP #define AFS_SMP 1 --- 45,51 ---- *************** *** 97,103 **** #endif #endif /* KERNEL */ - #define USE_UCONTEXT /* should be in afsconfig.h */ #endif /* _PARAM_IA64_LINUX20_H_ */ --- 95,100 ---- *************** *** 169,175 **** #define CMSERVERPREF #endif - #define USE_UCONTEXT /* should be in afsconfig.h */ #endif /* AFS_PARAM_H */ --- 166,171 ---- Index: openafs/src/config/param.parisc_linux24.h diff -c openafs/src/config/param.parisc_linux24.h:1.9.6.1 openafs/src/config/param.parisc_linux24.h:1.9.6.2 *** openafs/src/config/param.parisc_linux24.h:1.9.6.1 Mon Jun 12 12:25:48 2006 --- openafs/src/config/param.parisc_linux24.h Thu Nov 9 18:18:45 2006 *************** *** 25,33 **** #define AFS_NAMEI_ENV 1 /* User space interface to file system */ #if defined(__KERNEL__) && !defined(KDUMP_KERNEL) - #include - #include #ifdef CONFIG_SMP #undef CONFIG_SMP #endif --- 25,31 ---- Index: openafs/src/config/param.ppc64_linux24.h diff -c openafs/src/config/param.ppc64_linux24.h:1.4.6.1 openafs/src/config/param.ppc64_linux24.h:1.4.6.2 *** openafs/src/config/param.ppc64_linux24.h:1.4.6.1 Mon Jun 12 12:25:48 2006 --- openafs/src/config/param.ppc64_linux24.h Thu Nov 9 18:18:45 2006 *************** *** 29,37 **** #define AFS_64BITPOINTER_ENV 1 /* pointers are 64 bits. */ #if defined(__KERNEL__) && !defined(KDUMP_KERNEL) - #include - #include #ifdef CONFIG_SMP #undef CONFIG_SMP #endif --- 29,35 ---- Index: openafs/src/config/param.ppc64_linux26.h diff -c openafs/src/config/param.ppc64_linux26.h:1.3.6.4 openafs/src/config/param.ppc64_linux26.h:1.3.6.5 *** openafs/src/config/param.ppc64_linux26.h:1.3.6.4 Mon Jul 31 17:27:40 2006 --- openafs/src/config/param.ppc64_linux26.h Thu Nov 9 18:18:45 2006 *************** *** 30,38 **** #define AFS_64BITPOINTER_ENV 1 /* pointers are 64 bits. */ #if defined(__KERNEL__) && !defined(KDUMP_KERNEL) - #include - #include #ifdef CONFIG_SMP #ifndef AFS_SMP #define AFS_SMP 1 --- 30,36 ---- Index: openafs/src/config/param.ppc_linux22.h diff -c openafs/src/config/param.ppc_linux22.h:1.10 openafs/src/config/param.ppc_linux22.h:1.10.6.1 *** openafs/src/config/param.ppc_linux22.h:1.10 Wed Apr 27 17:43:24 2005 --- openafs/src/config/param.ppc_linux22.h Thu Nov 9 18:18:45 2006 *************** *** 23,29 **** #define AFS_NAMEI_ENV 1 /* User space interface to file system */ #if defined(__KERNEL__) && !defined(KDUMP_KERNEL) - #include #ifdef CONFIG_SMP #undef CONFIG_SMP #endif --- 23,28 ---- Index: openafs/src/config/param.ppc_linux24.h diff -c openafs/src/config/param.ppc_linux24.h:1.12.6.1 openafs/src/config/param.ppc_linux24.h:1.12.6.2 *** openafs/src/config/param.ppc_linux24.h:1.12.6.1 Mon Jun 12 12:25:48 2006 --- openafs/src/config/param.ppc_linux24.h Thu Nov 9 18:18:45 2006 *************** *** 27,35 **** #define AFS_NAMEI_ENV 1 /* User space interface to file system */ #if defined(__KERNEL__) && !defined(KDUMP_KERNEL) - #include - #include #ifdef CONFIG_SMP #undef CONFIG_SMP #endif --- 27,33 ---- Index: openafs/src/config/param.ppc_linux26.h diff -c openafs/src/config/param.ppc_linux26.h:1.3.6.4 openafs/src/config/param.ppc_linux26.h:1.3.6.5 *** openafs/src/config/param.ppc_linux26.h:1.3.6.4 Mon Jul 31 17:27:40 2006 --- openafs/src/config/param.ppc_linux26.h Thu Nov 9 18:18:45 2006 *************** *** 28,36 **** #define AFS_NAMEI_ENV 1 /* User space interface to file system */ #if defined(__KERNEL__) && !defined(KDUMP_KERNEL) - #include - #include #ifdef CONFIG_SMP #ifndef AFS_SMP #define AFS_SMP 1 --- 28,34 ---- Index: openafs/src/config/param.s390_linux22.h diff -c openafs/src/config/param.s390_linux22.h:1.12 openafs/src/config/param.s390_linux22.h:1.12.6.1 *** openafs/src/config/param.s390_linux22.h:1.12 Wed Apr 27 17:43:24 2005 --- openafs/src/config/param.s390_linux22.h Thu Nov 9 18:18:45 2006 *************** *** 33,39 **** #define AFS_NAMEI_ENV 1 /* User space interface to file system */ #if defined(__KERNEL__) && !defined(KDUMP_KERNEL) - #include #ifdef CONFIG_SMP #undef CONFIG_SMP #endif --- 33,38 ---- Index: openafs/src/config/param.s390_linux24.h diff -c openafs/src/config/param.s390_linux24.h:1.14.6.1 openafs/src/config/param.s390_linux24.h:1.14.6.2 *** openafs/src/config/param.s390_linux24.h:1.14.6.1 Mon Jun 12 12:25:48 2006 --- openafs/src/config/param.s390_linux24.h Thu Nov 9 18:18:45 2006 *************** *** 37,45 **** #define AFS_NAMEI_ENV 1 /* User space interface to file system */ #if defined(__KERNEL__) && !defined(KDUMP_KERNEL) - #include - #include #ifdef CONFIG_SMP #undef CONFIG_SMP #endif --- 37,43 ---- Index: openafs/src/config/param.s390_linux26.h diff -c openafs/src/config/param.s390_linux26.h:1.1.6.4 openafs/src/config/param.s390_linux26.h:1.1.6.5 *** openafs/src/config/param.s390_linux26.h:1.1.6.4 Mon Jul 31 17:27:40 2006 --- openafs/src/config/param.s390_linux26.h Thu Nov 9 18:18:45 2006 *************** *** 38,46 **** #define AFS_NAMEI_ENV 1 /* User space interface to file system */ #if defined(__KERNEL__) && !defined(KDUMP_KERNEL) - #include - #include #ifdef CONFIG_SMP #undef CONFIG_SMP #endif --- 38,44 ---- Index: openafs/src/config/param.s390x_linux24.h diff -c openafs/src/config/param.s390x_linux24.h:1.3.6.1 openafs/src/config/param.s390x_linux24.h:1.3.6.2 *** openafs/src/config/param.s390x_linux24.h:1.3.6.1 Mon Jun 12 12:25:48 2006 --- openafs/src/config/param.s390x_linux24.h Thu Nov 9 18:18:45 2006 *************** *** 42,50 **** #define AFS_NAMEI_ENV 1 /* User space interface to file system */ #if defined(__KERNEL__) && !defined(KDUMP_KERNEL) - #include - #include #ifdef CONFIG_SMP #undef CONFIG_SMP #endif --- 42,48 ---- Index: openafs/src/config/param.s390x_linux26.h diff -c openafs/src/config/param.s390x_linux26.h:1.4.4.4 openafs/src/config/param.s390x_linux26.h:1.4.4.5 *** openafs/src/config/param.s390x_linux26.h:1.4.4.4 Mon Jul 31 17:27:40 2006 --- openafs/src/config/param.s390x_linux26.h Thu Nov 9 18:18:45 2006 *************** *** 44,52 **** #define AFS_NAMEI_ENV 1 /* User space interface to file system */ #if defined(__KERNEL__) && !defined(KDUMP_KERNEL) - #include - #include #ifdef CONFIG_SMP #ifndef AFS_SMP #define AFS_SMP 1 --- 44,50 ---- Index: openafs/src/config/param.sparc64_linux22.h diff -c openafs/src/config/param.sparc64_linux22.h:1.10 openafs/src/config/param.sparc64_linux22.h:1.10.6.1 *** openafs/src/config/param.sparc64_linux22.h:1.10 Wed Apr 27 17:43:24 2005 --- openafs/src/config/param.sparc64_linux22.h Thu Nov 9 18:18:45 2006 *************** *** 38,44 **** #define AFS_64BITPOINTER_ENV 1 /* pointers are 64 bits. */ #if defined(__KERNEL__) && !defined(KDUMP_KERNEL) - #include #ifdef CONFIG_SMP #undef CONFIG_SMP #endif --- 38,43 ---- Index: openafs/src/config/param.sparc64_linux24.h diff -c openafs/src/config/param.sparc64_linux24.h:1.9.6.1 openafs/src/config/param.sparc64_linux24.h:1.9.6.2 *** openafs/src/config/param.sparc64_linux24.h:1.9.6.1 Mon Jun 12 12:25:48 2006 --- openafs/src/config/param.sparc64_linux24.h Thu Nov 9 18:18:45 2006 *************** *** 41,49 **** #define AFS_64BITPOINTER_ENV 1 /* pointers are 64 bits. */ #if defined(__KERNEL__) && !defined(KDUMP_KERNEL) - #include - #include #if defined(MODULE) && defined(CONFIG_MODVERSIONS) #define MODVERSIONS #include --- 41,47 ---- Index: openafs/src/config/param.sparc64_linux26.h diff -c openafs/src/config/param.sparc64_linux26.h:1.2.4.4 openafs/src/config/param.sparc64_linux26.h:1.2.4.5 *** openafs/src/config/param.sparc64_linux26.h:1.2.4.4 Mon Jul 31 17:27:40 2006 --- openafs/src/config/param.sparc64_linux26.h Thu Nov 9 18:18:45 2006 *************** *** 42,50 **** #define AFS_64BITPOINTER_ENV 1 /* pointers are 64 bits. */ #if defined(__KERNEL__) && !defined(KDUMP_KERNEL) - #include - #include #ifdef CONFIG_SMP #ifndef AFS_SMP #define AFS_SMP 1 --- 42,48 ---- Index: openafs/src/config/param.sparc_linux22.h diff -c openafs/src/config/param.sparc_linux22.h:1.11 openafs/src/config/param.sparc_linux22.h:1.11.6.1 *** openafs/src/config/param.sparc_linux22.h:1.11 Wed Apr 27 17:43:24 2005 --- openafs/src/config/param.sparc_linux22.h Thu Nov 9 18:18:45 2006 *************** *** 33,39 **** #define AFS_NAMEI_ENV 1 /* User space interface to file system */ #if defined(__KERNEL__) && !defined(KDUMP_KERNEL) - #include #ifdef CONFIG_SMP #undef CONFIG_SMP #endif --- 33,38 ---- Index: openafs/src/config/param.sparc_linux24.h diff -c openafs/src/config/param.sparc_linux24.h:1.10.6.1 openafs/src/config/param.sparc_linux24.h:1.10.6.2 *** openafs/src/config/param.sparc_linux24.h:1.10.6.1 Mon Jun 12 12:25:48 2006 --- openafs/src/config/param.sparc_linux24.h Thu Nov 9 18:18:45 2006 *************** *** 36,44 **** #define AFS_NAMEI_ENV 1 /* User space interface to file system */ #if defined(__KERNEL__) && !defined(KDUMP_KERNEL) - #include - #include #ifdef CONFIG_SMP #undef CONFIG_SMP #endif --- 36,42 ---- Index: openafs/src/libafs/afs.ppc_darwin_70.plist.in diff -c openafs/src/libafs/afs.ppc_darwin_70.plist.in:1.2.10.6 openafs/src/libafs/afs.ppc_darwin_70.plist.in:1.2.10.7 *** openafs/src/libafs/afs.ppc_darwin_70.plist.in:1.2.10.6 Wed Sep 6 17:15:18 2006 --- openafs/src/libafs/afs.ppc_darwin_70.plist.in Thu Nov 9 19:22:33 2006 *************** *** 15,25 **** CFBundlePackageType KEXT CFBundleShortVersionString ! 1.5.8 CFBundleSignature ???? CFBundleVersion ! 1.5.8 OSBundleLibraries com.apple.kernel.bsd --- 15,25 ---- CFBundlePackageType KEXT CFBundleShortVersionString ! 1.5.11 CFBundleSignature ???? CFBundleVersion ! 1.5.11 OSBundleLibraries com.apple.kernel.bsd Index: openafs/src/libafs/afs.ppc_darwin_80.plist.in diff -c openafs/src/libafs/afs.ppc_darwin_80.plist.in:1.2.4.6 openafs/src/libafs/afs.ppc_darwin_80.plist.in:1.2.4.7 *** openafs/src/libafs/afs.ppc_darwin_80.plist.in:1.2.4.6 Wed Sep 6 17:15:18 2006 --- openafs/src/libafs/afs.ppc_darwin_80.plist.in Thu Nov 9 19:22:33 2006 *************** *** 15,25 **** CFBundlePackageType KEXT CFBundleShortVersionString ! 1.5.8 CFBundleSignature ???? CFBundleVersion ! 1.5.8 OSBundleLibraries com.apple.kpi.bsd --- 15,25 ---- CFBundlePackageType KEXT CFBundleShortVersionString ! 1.5.11 CFBundleSignature ???? CFBundleVersion ! 1.5.11 OSBundleLibraries com.apple.kpi.bsd Index: openafs/src/libafs/afs.ppc_darwin_90.plist.in diff -c openafs/src/libafs/afs.ppc_darwin_90.plist.in:1.1.6.6 openafs/src/libafs/afs.ppc_darwin_90.plist.in:1.1.6.7 *** openafs/src/libafs/afs.ppc_darwin_90.plist.in:1.1.6.6 Wed Sep 6 17:15:18 2006 --- openafs/src/libafs/afs.ppc_darwin_90.plist.in Thu Nov 9 19:22:33 2006 *************** *** 15,25 **** CFBundlePackageType KEXT CFBundleShortVersionString ! 1.5.8 CFBundleSignature ???? CFBundleVersion ! 1.5.8 OSBundleLibraries com.apple.kpi.bsd --- 15,25 ---- CFBundlePackageType KEXT CFBundleShortVersionString ! 1.5.11 CFBundleSignature ???? CFBundleVersion ! 1.5.11 OSBundleLibraries com.apple.kpi.bsd Index: openafs/src/libafs/afs.x86_darwin_80.plist.in diff -c openafs/src/libafs/afs.x86_darwin_80.plist.in:1.1.6.6 openafs/src/libafs/afs.x86_darwin_80.plist.in:1.1.6.7 *** openafs/src/libafs/afs.x86_darwin_80.plist.in:1.1.6.6 Wed Sep 6 17:15:18 2006 --- openafs/src/libafs/afs.x86_darwin_80.plist.in Thu Nov 9 19:22:33 2006 *************** *** 15,25 **** CFBundlePackageType KEXT CFBundleShortVersionString ! 1.5.8 CFBundleSignature ???? CFBundleVersion ! 1.5.8 OSBundleLibraries com.apple.kpi.bsd --- 15,25 ---- CFBundlePackageType KEXT CFBundleShortVersionString ! 1.5.11 CFBundleSignature ???? CFBundleVersion ! 1.5.11 OSBundleLibraries com.apple.kpi.bsd Index: openafs/src/libafs/afs.x86_darwin_90.plist.in diff -c openafs/src/libafs/afs.x86_darwin_90.plist.in:1.1.6.6 openafs/src/libafs/afs.x86_darwin_90.plist.in:1.1.6.7 *** openafs/src/libafs/afs.x86_darwin_90.plist.in:1.1.6.6 Wed Sep 6 17:15:18 2006 --- openafs/src/libafs/afs.x86_darwin_90.plist.in Thu Nov 9 19:22:33 2006 *************** *** 15,25 **** CFBundlePackageType KEXT CFBundleShortVersionString ! 1.5.8 CFBundleSignature ???? CFBundleVersion ! 1.5.8 OSBundleLibraries com.apple.kpi.bsd --- 15,25 ---- CFBundlePackageType KEXT CFBundleShortVersionString ! 1.5.11 CFBundleSignature ???? CFBundleVersion ! 1.5.11 OSBundleLibraries com.apple.kpi.bsd Index: openafs/src/packaging/MacOS/InstallationCheck diff -c openafs/src/packaging/MacOS/InstallationCheck:1.2 openafs/src/packaging/MacOS/InstallationCheck:removed *** openafs/src/packaging/MacOS/InstallationCheck:1.2 Sat Oct 8 22:52:33 2005 --- openafs/src/packaging/MacOS/InstallationCheck Sun Nov 12 21:30:52 2006 *************** *** 1,10 **** - #!/bin/sh - majorvers=`uname -r | sed 's/\..*//'` - echo "InstallationCheck: os release is $majorvers" - if [ $majorvers -ne 8 ]; then - echo "InstallationCheck: not ok" - exit 112 - fi - - echo "InstallationCheck: ok" - exit 0 --- 0 ---- Index: openafs/src/packaging/MacOS/InstallationCheck.8 diff -c /dev/null openafs/src/packaging/MacOS/InstallationCheck.8:1.1.4.2 *** /dev/null Sun Nov 12 21:30:52 2006 --- openafs/src/packaging/MacOS/InstallationCheck.8 Thu Nov 9 19:20:19 2006 *************** *** 0 **** --- 1,10 ---- + #!/bin/sh + majorvers=`uname -r | sed 's/\..*//'` + echo "InstallationCheck: os release is $majorvers" + if [ $majorvers -ne 8 ]; then + echo "InstallationCheck: not ok" + exit 112 + fi + + echo "InstallationCheck: ok" + exit 0 Index: openafs/src/packaging/MacOS/InstallationCheck.9 diff -c /dev/null openafs/src/packaging/MacOS/InstallationCheck.9:1.1.4.2 *** /dev/null Sun Nov 12 21:30:52 2006 --- openafs/src/packaging/MacOS/InstallationCheck.9 Thu Nov 9 19:20:19 2006 *************** *** 0 **** --- 1,10 ---- + #!/bin/sh + majorvers=`uname -r | sed 's/\..*//'` + echo "InstallationCheck: os release is $majorvers" + if [ $majorvers -ne 9 ]; then + echo "InstallationCheck: not ok" + exit 112 + fi + + echo "InstallationCheck: ok" + exit 0 Index: openafs/src/packaging/MacOS/OpenAFS.Info.plist diff -c openafs/src/packaging/MacOS/OpenAFS.Info.plist:1.2.10.7 openafs/src/packaging/MacOS/OpenAFS.Info.plist:1.2.10.8 *** openafs/src/packaging/MacOS/OpenAFS.Info.plist:1.2.10.7 Wed Sep 6 17:15:19 2006 --- openafs/src/packaging/MacOS/OpenAFS.Info.plist Thu Nov 9 19:22:35 2006 *************** *** 3,15 **** CFBundleGetInfoString ! OpenAFS 1.5.8 CFBundleIdentifier org.openafs.OpenAFS.pkg CFBundleName OpenAFS CFBundleShortVersionString ! 1.5.8 IFMajorVersion 1 IFMinorVersion --- 3,15 ---- CFBundleGetInfoString ! OpenAFS 1.5.11 CFBundleIdentifier org.openafs.OpenAFS.pkg CFBundleName OpenAFS CFBundleShortVersionString ! 1.5.11 IFMajorVersion 1 IFMinorVersion Index: openafs/src/packaging/MacOS/OpenAFS.info diff -c openafs/src/packaging/MacOS/OpenAFS.info:1.1.12.6 openafs/src/packaging/MacOS/OpenAFS.info:1.1.12.7 *** openafs/src/packaging/MacOS/OpenAFS.info:1.1.12.6 Wed Sep 6 17:15:19 2006 --- openafs/src/packaging/MacOS/OpenAFS.info Thu Nov 9 19:22:35 2006 *************** *** 1,5 **** Title OpenAFS ! Version 1.5.8 Description The OpenAFS distributed filesystem. This package installs an almost-ready-to-run client for OpenAFS. see http://www.openafs.org for more information. DefaultLocation / Diskname (null) --- 1,5 ---- Title OpenAFS ! Version 1.5.11 Description The OpenAFS distributed filesystem. This package installs an almost-ready-to-run client for OpenAFS. see http://www.openafs.org for more information. DefaultLocation / Diskname (null) Index: openafs/src/packaging/MacOS/OpenAFS.pre_upgrade diff -c openafs/src/packaging/MacOS/OpenAFS.pre_upgrade:1.2 openafs/src/packaging/MacOS/OpenAFS.pre_upgrade:1.2.2.1 *** openafs/src/packaging/MacOS/OpenAFS.pre_upgrade:1.2 Thu Mar 23 11:07:30 2006 --- openafs/src/packaging/MacOS/OpenAFS.pre_upgrade Thu Nov 9 23:11:33 2006 *************** *** 23,26 **** fi fi ! /Library/StartupItems/OpenAFS/OpenAFS stop --- 23,28 ---- fi fi ! if [ -f /Library/StartupItems/OpenAFS/OpenAFS ]; then ! /Library/StartupItems/OpenAFS/OpenAFS stop ! fi Index: openafs/src/packaging/MacOS/buildpkg.sh diff -c openafs/src/packaging/MacOS/buildpkg.sh:1.13.2.5 openafs/src/packaging/MacOS/buildpkg.sh:1.13.2.6 *** openafs/src/packaging/MacOS/buildpkg.sh:1.13.2.5 Thu Aug 10 13:09:02 2006 --- openafs/src/packaging/MacOS/buildpkg.sh Thu Nov 9 19:20:19 2006 *************** *** 114,120 **** mkdir -p $PKGROOT/private/var/db/openafs/cache mkdir -p $PKGROOT/private/var/db/openafs/etc/config cp $CURDIR/CellServDB $PKGROOT/private/var/db/openafs/etc/CellServDB.master ! echo openafs.org > $PKGROOT/private/var/db/openafs/etc/ThisCell.sample if [ $majorvers -ge 7 ]; then echo /afs:/var/db/openafs/cache:30000 > $PKGROOT/private/var/db/openafs/etc/cacheinfo.sample cp -RP $PKGROOT/Library/OpenAFS/Tools/etc/afssettings $PKGROOT/private/var/db/openafs/etc/config --- 114,120 ---- mkdir -p $PKGROOT/private/var/db/openafs/cache mkdir -p $PKGROOT/private/var/db/openafs/etc/config cp $CURDIR/CellServDB $PKGROOT/private/var/db/openafs/etc/CellServDB.master ! echo grand.central.org > $PKGROOT/private/var/db/openafs/etc/ThisCell.sample if [ $majorvers -ge 7 ]; then echo /afs:/var/db/openafs/cache:30000 > $PKGROOT/private/var/db/openafs/etc/cacheinfo.sample cp -RP $PKGROOT/Library/OpenAFS/Tools/etc/afssettings $PKGROOT/private/var/db/openafs/etc/config *************** *** 122,128 **** else echo /Network/afs:/var/db/openafs/cache:30000 > $PKGROOT/private/var/db/openafs/etc/cacheinfo.sample fi ! echo '-afsdb -stat 2000 -dcache 800 -daemons 3 -volumes 70 -dynroot -fakestat-all' > $PKGROOT/private/var/db/openafs/etc/config/afsd.options.sample strip -X -S $PKGROOT/Library/OpenAFS/Tools/root.client/usr/vice/etc/afs.kext/Contents/MacOS/afs --- 122,128 ---- else echo /Network/afs:/var/db/openafs/cache:30000 > $PKGROOT/private/var/db/openafs/etc/cacheinfo.sample fi ! echo '-memcache -afsdb -stat 2000 -dcache 800 -daemons 3 -volumes 70 -dynroot -fakestat-all' > $PKGROOT/private/var/db/openafs/etc/config/afsd.options.sample strip -X -S $PKGROOT/Library/OpenAFS/Tools/root.client/usr/vice/etc/afs.kext/Contents/MacOS/afs *************** *** 171,177 **** cp OpenAFS.post_install $PKGRES/postupgrade cp background.jpg $PKGRES/background.jpg if [ $majorvers -ge 8 ]; then ! cp InstallationCheck $PKGRES mkdir -p $PKGRES/English.lproj cp InstallationCheck $PKGRES/English.lproj chmod a+x $PKGRES/InstallationCheck --- 171,177 ---- cp OpenAFS.post_install $PKGRES/postupgrade cp background.jpg $PKGRES/background.jpg if [ $majorvers -ge 8 ]; then ! cp InstallationCheck.$majorvers $PKGRES/InstallationCheck mkdir -p $PKGRES/English.lproj cp InstallationCheck $PKGRES/English.lproj chmod a+x $PKGRES/InstallationCheck Index: openafs/src/rx/rx_kcommon.c diff -c openafs/src/rx/rx_kcommon.c:1.56.2.2 openafs/src/rx/rx_kcommon.c:1.56.2.3 *** openafs/src/rx/rx_kcommon.c:1.56.2.2 Thu Aug 31 00:52:16 2006 --- openafs/src/rx/rx_kcommon.c Thu Nov 9 19:20:19 2006 *************** *** 15,21 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/rx/rx_kcommon.c,v 1.56.2.2 2006/08/31 04:52:16 shadow Exp $"); #include "rx/rx_kcommon.h" --- 15,21 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/rx/rx_kcommon.c,v 1.56.2.3 2006/11/10 00:20:19 shadow Exp $"); #include "rx/rx_kcommon.h" *************** *** 635,645 **** afs_uint32 ifinaddr; #if defined(AFS_DARWIN80_ENV) errno_t t; ! int cnt=0; ! ifaddr_t *ifads, ifad; ! register ifnet_t ifn; struct sockaddr sout; struct sockaddr_in *sin; #else struct ifaddr *ifad; /* ifnet points to a if_addrlist of ifaddrs */ register struct ifnet *ifn; --- 635,647 ---- afs_uint32 ifinaddr; #if defined(AFS_DARWIN80_ENV) errno_t t; ! unsigned int count; ! int cnt=0, m, j; ! ifaddr_t *ifads; ! ifnet_t *ifn; struct sockaddr sout; struct sockaddr_in *sin; + struct in_addr pin; #else struct ifaddr *ifad; /* ifnet points to a if_addrlist of ifaddrs */ register struct ifnet *ifn; *************** *** 649,679 **** memset(mtus, 0, sizeof(mtus)); #if defined(AFS_DARWIN80_ENV) ! t = ifnet_get_address_list_family(NULL, &ifads, AF_INET); ! if (t == 0) { ! rxmtu = ifnet_mtu(ifn) - RX_IPUDP_SIZE; ! while((ifads[cnt] != NULL) && cnt < ADDRSPERSITE) { ! t = ifaddr_address(ifads[cnt], &sout, sizeof(sout)); ! sin = (struct sockaddr_in *)&sout; ! ifinaddr = ntohl(sin->sin_addr.s_addr); ! if (myNetAddrs[i] != ifinaddr) { ! different++; ! } ! mtus[i] = rxmtu; ! rxmtu = rxi_AdjustIfMTU(rxmtu); ! maxmtu = ! rxmtu * rxi_nRecvFrags + ! ((rxi_nRecvFrags - 1) * UDP_HDR_SIZE); ! maxmtu = rxi_AdjustMaxMTU(rxmtu, maxmtu); ! addrs[i++] = ifinaddr; ! if ((ifinaddr != 0x7f000001) && (maxmtu > rx_maxReceiveSize)) { ! rx_maxReceiveSize = MIN(RX_MAX_PACKET_SIZE, maxmtu); ! rx_maxReceiveSize = ! MIN(rx_maxReceiveSize, rx_maxReceiveSizeUser); } - cnt++; } ! ifnet_free_address_list(ifads); } #else #if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) --- 651,688 ---- memset(mtus, 0, sizeof(mtus)); #if defined(AFS_DARWIN80_ENV) ! if (!ifnet_list_get(AF_INET, &ifn, &count)) { ! for (m = 0; m < count; m++) { ! if (!ifnet_get_address_list(ifn[m], &ifads)) { ! for (j = 0; ifads[j] != NULL && cnt < ADDRSPERSITE; j++) { ! if ((t = ifaddr_address(ifads[j], &sout, sizeof(struct sockaddr))) == 0) { ! sin = (struct sockaddr_in *)&sout; ! rxmtu = ifnet_mtu(ifaddr_ifnet(ifads[j])) - RX_IPUDP_SIZE; ! ifinaddr = ntohl(sin->sin_addr.s_addr); ! if (myNetAddrs[i] != ifinaddr) { ! different++; ! } ! mtus[i] = rxmtu; ! rxmtu = rxi_AdjustIfMTU(rxmtu); ! maxmtu = ! rxmtu * rxi_nRecvFrags + ! ((rxi_nRecvFrags - 1) * UDP_HDR_SIZE); ! maxmtu = rxi_AdjustMaxMTU(rxmtu, maxmtu); ! addrs[i++] = ifinaddr; ! if ((ifinaddr != 0x7f000001) && ! (maxmtu > rx_maxReceiveSize)) { ! rx_maxReceiveSize = ! MIN(RX_MAX_PACKET_SIZE, maxmtu); ! rx_maxReceiveSize = ! MIN(rx_maxReceiveSize, rx_maxReceiveSizeUser); ! } ! cnt++; ! } ! } ! ifnet_free_address_list(ifads); } } ! ifnet_list_free(ifn); } #else #if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) *************** *** 729,738 **** rx_maxJumboRecvSize = MAX(rx_maxJumboRecvSize, rx_maxReceiveSize); if (different) { ! int j; ! for (j = 0; j < i; j++) { ! myNetMTUs[j] = mtus[j]; ! myNetAddrs[j] = addrs[j]; } } return different; --- 738,747 ---- rx_maxJumboRecvSize = MAX(rx_maxJumboRecvSize, rx_maxReceiveSize); if (different) { ! int l; ! for (l = 0; l < i; l++) { ! myNetMTUs[l] = mtus[l]; ! myNetAddrs[l] = addrs[l]; } } return different; Index: openafs/src/rxkad/rxkad_server.c diff -c openafs/src/rxkad/rxkad_server.c:1.21 openafs/src/rxkad/rxkad_server.c:1.21.2.2 *** openafs/src/rxkad/rxkad_server.c:1.21 Fri Apr 14 09:12:16 2006 --- openafs/src/rxkad/rxkad_server.c Sat Nov 4 18:55:22 2006 *************** *** 15,21 **** #include RCSID ! ("$Header: /cvs/openafs/src/rxkad/rxkad_server.c,v 1.21 2006/04/14 13:12:16 shadow Exp $"); #include #include --- 15,21 ---- #include RCSID ! ("$Header: /cvs/openafs/src/rxkad/rxkad_server.c,v 1.21.2.2 2006/11/04 23:55:22 jaltman Exp $"); #include #include *************** *** 352,364 **** client.instance, client.cell, &sessionkey, &host, &start, &end); if (code) ! return RXKADBADTICKET; } code = tkt_CheckTimes(start, end, time(0)); ! if (code == -1) return RXKADEXPIRED; else if (code <= 0) ! return RXKADNOAUTH; code = fc_keysched(&sessionkey, sconn->keysched); if (code) --- 352,368 ---- client.instance, client.cell, &sessionkey, &host, &start, &end); if (code) ! return code; } code = tkt_CheckTimes(start, end, time(0)); ! if (code == 0) ! return RXKADNOAUTH; ! else if (code == -1) return RXKADEXPIRED; + else if (code < -1) + return RXKADBADTICKET; else if (code <= 0) ! return RXKADBADTICKET; code = fc_keysched(&sessionkey, sconn->keysched); if (code) Index: openafs/src/rxkad/ticket.c diff -c openafs/src/rxkad/ticket.c:1.13 openafs/src/rxkad/ticket.c:1.13.14.1 *** openafs/src/rxkad/ticket.c:1.13 Tue Jul 15 19:16:42 2003 --- openafs/src/rxkad/ticket.c Sat Nov 4 18:55:22 2006 *************** *** 15,21 **** #endif RCSID ! ("$Header: /cvs/openafs/src/rxkad/ticket.c,v 1.13 2003/07/15 23:16:42 shadow Exp $"); #if defined(UKERNEL) #include "afs/sysincludes.h" --- 15,21 ---- #endif RCSID ! ("$Header: /cvs/openafs/src/rxkad/ticket.c,v 1.13.14.1 2006/11/04 23:55:22 jaltman Exp $"); #if defined(UKERNEL) #include "afs/sysincludes.h" *************** *** 148,154 **** if (code) return RXKADBADTICKET; ! if (tkt_CheckTimes(*start, *end, time(0)) < -1) return RXKADBADTICKET; return 0; --- 148,160 ---- if (code) return RXKADBADTICKET; ! ! code = tkt_CheckTimes(*start, *end, time(0)); ! if (code == 0) ! return RXKADNOAUTH; ! else if (code == -1) ! return RXKADEXPIRED; ! else if (code < -1) return RXKADBADTICKET; return 0;