From: Jeffrey Altman Date: Tue, 5 Oct 2010 12:31:22 +0000 (-0400) Subject: Windows: Kill AFS_LARGEFILES preprocessor symbol X-Git-Tag: openafs-devel-1_7_1~1454 X-Git-Url: https://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=d73bd5778a22f574a6f065a18f18d4379e9ffb4a;hp=fc9aa428f4f9a5b5188ace7bfb0301a3a184e9c0 Windows: Kill AFS_LARGEFILES preprocessor symbol All builds define AFS_LARGEFILES so kill the symbol and discard the !AFS_LARGEFILES source code. Change-Id: I36a2131e30b24d3d1a8f37f5629795bdd92c6b27 Reviewed-on: http://gerrit.openafs.org/2910 Reviewed-by: Jeffrey Altman Tested-by: Jeffrey Altman --- diff --git a/src/WINNT/afsd/cm.h b/src/WINNT/afsd/cm.h index 0e2b70b..059ab66 100644 --- a/src/WINNT/afsd/cm.h +++ b/src/WINNT/afsd/cm.h @@ -15,11 +15,6 @@ #define AFS_PTHREAD_ENV 1 #endif -/* Support largefiles by default */ -#ifndef AFS_LARGEFILES -#define AFS_LARGEFILES 1 -#endif - #include #include #include diff --git a/src/WINNT/afsd/cm_dcache.c b/src/WINNT/afsd/cm_dcache.c index 9742d40..72081fb 100644 --- a/src/WINNT/afsd/cm_dcache.c +++ b/src/WINNT/afsd/cm_dcache.c @@ -30,15 +30,10 @@ extern void afsi_log(char *pattern, ...); extern osi_mutex_t cm_Freelance_Lock; #endif -#ifdef AFS_LARGEFILES /* we can access connp->serverp without holding a lock because that never changes since the connection is made. */ #define SERVERHAS64BIT(connp) (!((connp)->serverp->flags & CM_SERVERFLAG_NO64BIT)) #define SET_SERVERHASNO64BIT(connp) (cm_SetServerNo64Bit((connp)->serverp, TRUE)) -#else -#define SERVERHAS64BIT(connp) (FALSE) -#define SET_SERVERHASNO64BIT(connp) (FALSE) -#endif /* functions called back from the buffer package when reading or writing data, * or when holding or releasing a vnode pointer. @@ -55,9 +50,7 @@ long cm_BufWrite(void *vscp, osi_hyper_t *offsetp, long length, long flags, long code, code1; cm_scache_t *scp = vscp; afs_int32 nbytes; -#ifdef AFS_LARGEFILES afs_int32 save_nbytes; -#endif long temp; AFSFetchStatus outStatus; AFSStoreStatus inStatus; @@ -157,9 +150,7 @@ long cm_BufWrite(void *vscp, osi_hyper_t *offsetp, long length, long flags, lock_ReleaseWrite(&scp->rw); /* now we're ready to do the store operation */ -#ifdef AFS_LARGEFILES save_nbytes = nbytes; -#endif do { code = cm_ConnFromFID(&scp->fid, userp, reqp, &connp); if (code) @@ -170,7 +161,6 @@ long cm_BufWrite(void *vscp, osi_hyper_t *offsetp, long length, long flags, rxcallp = rx_NewCall(rxconnp); rx_PutConnection(rxconnp); -#ifdef AFS_LARGEFILES if (SERVERHAS64BIT(connp)) { call_was_64bit = 1; @@ -203,17 +193,6 @@ long cm_BufWrite(void *vscp, osi_hyper_t *offsetp, long length, long flags, osi_Log0(afsd_logp, "CALL StartRXAFS_StoreData SUCCESS"); } } -#else - osi_Log4(afsd_logp, "CALL StartRXAFS_StoreData scp 0x%p, offset 0x%x:%08x, length 0x%x", - scp, biod.offset.HighPart, biod.offset.LowPart, nbytes); - - code = StartRXAFS_StoreData(rxcallp, &tfid, &inStatus, - biod.offset.LowPart, nbytes, truncPos.LowPart); - if (code) - osi_Log1(afsd_logp, "CALL StartRXAFS_StoreData FAILURE, code 0x%x", code); - else - osi_Log0(afsd_logp, "CALL StartRXAFS_StoreData SUCCESS"); -#endif if (code == 0) { /* write the data from the the list of buffers */ @@ -265,14 +244,13 @@ long cm_BufWrite(void *vscp, osi_hyper_t *offsetp, long length, long flags, code1 = rx_EndCall(rxcallp, code); -#ifdef AFS_LARGEFILES if ((code == RXGEN_OPCODE || code1 == RXGEN_OPCODE) && SERVERHAS64BIT(connp)) { SET_SERVERHASNO64BIT(connp); qdp = NULL; nbytes = save_nbytes; goto retry; } -#endif + /* Prefer StoreData error over rx_EndCall error */ if (code1 != 0) code = code1; @@ -393,7 +371,6 @@ long cm_StoreMini(cm_scache_t *scp, cm_user_t *userp, cm_req_t *reqp) rxcallp = rx_NewCall(rxconnp); rx_PutConnection(rxconnp); -#ifdef AFS_LARGEFILES if (SERVERHAS64BIT(connp)) { call_was_64bit = 1; @@ -409,10 +386,6 @@ long cm_StoreMini(cm_scache_t *scp, cm_user_t *userp, cm_req_t *reqp) 0, 0, truncPos.LowPart); } } -#else - code = StartRXAFS_StoreData(rxcallp, &tfid, &inStatus, - 0, 0, truncPos.LowPart); -#endif if (code == 0) { if (call_was_64bit) @@ -422,12 +395,11 @@ long cm_StoreMini(cm_scache_t *scp, cm_user_t *userp, cm_req_t *reqp) } code1 = rx_EndCall(rxcallp, code); -#ifdef AFS_LARGEFILES if ((code == RXGEN_OPCODE || code1 == RXGEN_OPCODE) && SERVERHAS64BIT(connp)) { SET_SERVERHASNO64BIT(connp); goto retry; } -#endif + /* prefer StoreData error over rx_EndCall error */ if (code == 0 && code1 != 0) code = code1; @@ -1738,7 +1710,6 @@ long cm_GetBuffer(cm_scache_t *scp, cm_buf_t *bufp, int *cpffp, cm_user_t *userp rxcallp = rx_NewCall(rxconnp); rx_PutConnection(rxconnp); -#ifdef AFS_LARGEFILES nbytes = nbytes_hi = 0; if (SERVERHAS64BIT(connp)) { @@ -1809,37 +1780,6 @@ long cm_GetBuffer(cm_scache_t *scp, cm_buf_t *bufp, int *cpffp, cm_user_t *userp } /* for the moment, nbytes_hi will always be 0 if code == 0 because biod.length is a 32-bit quantity. */ -#else - osi_Log3(afsd_logp, "CALL FetchData scp 0x%p, off 0x%x, size 0x%x", - scp, biod.offset.LowPart, biod.length); - - code = StartRXAFS_FetchData(rxcallp, &tfid, biod.offset.LowPart, - biod.length); - - /* now copy the data out of the pipe and put it in the buffer */ - if (code == 0) { - temp = rx_Read32(rxcallp, &nbytes); - if (temp == sizeof(afs_int32)) { - length_found = ntohl(nbytes); - if (length_found > biod.length) { - /* - * prior to 1.4.12 and 1.5.65 the file server would return - * (filesize - offset) if the requested offset was greater than - * the filesize. The correct return value would have been zero. - * Force a retry by returning an RX_PROTOCOL_ERROR. If the cause - * is a race between two RPCs issues by this cache manager, the - * correct thing will happen the second time. - */ - osi_Log0(afsd_logp, "cm_GetBuffer length_found > biod.length"); - fs_fetchdata_offset_bug = 1; - } - } - else { - osi_Log1(afsd_logp, "cm_GetBuffer rx_Read32 returns %d != 4", temp); - code = (rxcallp->error < 0) ? rxcallp->error : RX_PROTOCOL_ERROR; - } - } -#endif if (code == 0) { qdp = biod.bufListEndp; diff --git a/src/WINNT/afsd/smb.c b/src/WINNT/afsd/smb.c index 3a6e2c8..dc348d5 100644 --- a/src/WINNT/afsd/smb.c +++ b/src/WINNT/afsd/smb.c @@ -3679,21 +3679,12 @@ long smb_ReceiveCoreReadRaw(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp if (*inp->wctp == 10) { /* we were sent a request with 64-bit file offsets */ -#ifdef AFS_LARGEFILES offset.HighPart = smb_GetSMBParm(inp, 8) | (smb_GetSMBParm(inp, 9) << 16); if (LargeIntegerLessThanZero(offset)) { osi_Log0(smb_logp, "smb_ReceiveCoreReadRaw received negative 64-bit offset"); goto send1; } -#else - if ((smb_GetSMBParm(inp, 8) | (smb_GetSMBParm(inp, 9) << 16)) != 0) { - osi_Log0(smb_logp, "smb_ReceiveCoreReadRaw received 64-bit file offset. Dropping request."); - goto send1; - } else { - offset.HighPart = 0; - } -#endif } else { /* we were sent a request with 32-bit file offsets */ offset.HighPart = 0; @@ -3952,9 +3943,7 @@ long smb_ReceiveNegotiate(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp) #ifdef DFS_SUPPORT NTNEGOTIATE_CAPABILITY_DFS | #endif -#ifdef AFS_LARGEFILES NTNEGOTIATE_CAPABILITY_LARGEFILES | -#endif NTNEGOTIATE_CAPABILITY_NTFIND | NTNEGOTIATE_CAPABILITY_RAWMODE | NTNEGOTIATE_CAPABILITY_NTSMB; @@ -7794,7 +7783,6 @@ long smb_ReceiveCoreWriteRaw(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *out if (*inp->wctp == 14) { /* we received a 64-bit file offset */ -#ifdef AFS_LARGEFILES offset.HighPart = smb_GetSMBParm(inp, 12) | (smb_GetSMBParm(inp, 13) << 16); if (LargeIntegerLessThanZero(offset)) { @@ -7803,15 +7791,6 @@ long smb_ReceiveCoreWriteRaw(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *out offset.HighPart, offset.LowPart); return CM_ERROR_BADSMB; } -#else - if ((smb_GetSMBParm(inp, 12) | (smb_GetSMBParm(inp, 13) << 16)) != 0) { - osi_Log0(smb_logp, - "smb_ReceiveCoreWriteRaw received 64-bit file offset, but we don't support large files"); - return CM_ERROR_BADSMB; - } - - offset.HighPart = 0; -#endif } else { offset.HighPart = 0; /* 32-bit file offset */ } diff --git a/src/WINNT/afsd/smb3.c b/src/WINNT/afsd/smb3.c index 18f494c..9811d3f 100644 --- a/src/WINNT/afsd/smb3.c +++ b/src/WINNT/afsd/smb3.c @@ -6982,17 +6982,7 @@ long smb_ReceiveV3WriteX(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp) if (*inp->wctp == 14) { /* we have a request with 64-bit file offsets */ -#ifdef AFS_LARGEFILES offset.HighPart = smb_GetSMBParm(inp, 12) | (smb_GetSMBParm(inp, 13) << 16); -#else - if ((smb_GetSMBParm(inp, 12) | (smb_GetSMBParm(inp, 13) << 16)) != 0) { - /* uh oh */ - osi_Log0(smb_logp, "smb_ReceiveV3WriteX offset requires largefile support"); - /* we shouldn't have received this op if we didn't specify - largefile support */ - return CM_ERROR_INVAL; - } -#endif } op = inp->data + smb_GetSMBParm(inp, 11); @@ -7139,7 +7129,6 @@ long smb_ReceiveV3ReadX(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp) if (*inp->wctp == 12) { /* a request with 64-bit offsets */ -#ifdef AFS_LARGEFILES offset.HighPart = smb_GetSMBParm(inp, 10) | (smb_GetSMBParm(inp, 11) << 16); if (LargeIntegerLessThanZero(offset)) { @@ -7147,14 +7136,6 @@ long smb_ReceiveV3ReadX(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp) offset.HighPart, offset.LowPart); return CM_ERROR_BADSMB; } -#else - if ((smb_GetSMBParm(inp, 10) | (smb_GetSMBParm(inp, 11) << 16)) != 0) { - osi_Log0(smb_logp, "smb_ReceiveV3Read offset is 64-bit. Dropping"); - return CM_ERROR_BADSMB; - } else { - offset.HighPart = 0; - } -#endif } else { offset.HighPart = 0; }