#undef kmem_free
#undef mem_alloc
#undef mem_free
-#undef register
#endif /* AFS_ALPHA_ENV */
#include "afsincludes.h" /* Afs-based standard headers */
#include "afs/afs_stats.h" /* statistics */
extern int cacheDiskType;
#ifndef AFS_NOSTATS
-void
-FillStoreStats(int code, int idx, osi_timeval_t *xferStartTime,
+static void
+FillStoreStats(int code, int idx, osi_timeval_t xferStartTime,
afs_size_t bytesToXfer, afs_size_t bytesXferred)
{
struct afs_stats_xferData *xferP;
else
(xferP->count[8])++;
- afs_stats_GetDiff(elapsedTime, (*xferStartTime), xferStopTime);
+ afs_stats_GetDiff(elapsedTime, xferStartTime, xferStopTime);
afs_stats_AddTo((xferP->sumTime), elapsedTime);
afs_stats_SquareAddTo((xferP->sqrTime), elapsedTime);
if (afs_stats_TimeLessThan(elapsedTime, (xferP->minTime))) {
afs_int32 code;
struct rxfs_storeVariables *v = (struct rxfs_storeVariables *) r;
- *tlen = (size > AFS_LRALLOCSIZ ? AFS_LRALLOCSIZ : size);
RX_AFS_GUNLOCK();
- code = rx_WritevAlloc(v->call, v->tiov, &v->tnio, RX_MAXIOVECS, *tlen);
+ code = rx_WritevAlloc(v->call, v->tiov, &v->tnio, RX_MAXIOVECS, size);
RX_AFS_GLOCK();
if (code <= 0) {
code = rx_Error(v->call);
static
struct storeOps rxfs_storeUfsOps = {
-#if (defined(AFS_SGI_ENV) && !defined(__c99))
+#ifndef HAVE_STRUCT_LABEL_SUPPORT
rxfs_storeUfsPrepare,
rxfs_storeUfsRead,
rxfs_storeUfsWrite,
static
struct storeOps rxfs_storeMemOps = {
-#if (defined(AFS_SGI_ENV) && !defined(__c99))
+#ifndef HAVE_STRUCT_LABEL_SUPPORT
rxfs_storeMemPrepare,
rxfs_storeMemRead,
rxfs_storeMemWrite,
.padd = rxfs_storePadd,
.close = rxfs_storeClose,
.destroy = rxfs_storeDestroy,
-#ifdef AFS_LINUX26_ENV
- .storeproc = afs_linux_storeproc
-#else
.storeproc = afs_GenericStoreProc
#endif
-#endif
};
afs_int32
-rxfs_storeInit(struct vcache *avc, struct afs_conn *tc, afs_size_t base,
+rxfs_storeInit(struct vcache *avc, struct afs_conn *tc,
+ struct rx_connection *rxconn, afs_size_t base,
afs_size_t bytes, afs_size_t length,
int sync, struct storeOps **ops, void **rock)
{
if ( !tc )
return -1;
- v = (struct rxfs_storeVariables *) osi_AllocSmallSpace(sizeof(struct rxfs_storeVariables));
+ v = osi_AllocSmallSpace(sizeof(struct rxfs_storeVariables));
if (!v)
osi_Panic("rxfs_storeInit: osi_AllocSmallSpace returned NULL\n");
memset(v, 0, sizeof(struct rxfs_storeVariables));
if (sync & AFS_SYNC)
v->InStatus.Mask |= AFS_FSYNC;
RX_AFS_GUNLOCK();
- v->call = rx_NewCall(tc->id);
+ v->call = rx_NewCall(rxconn);
if (v->call) {
#ifdef AFS_64BIT_CLIENT
if (!afs_serverHasNo64Bit(tc))
code = StartRXAFS_StoreData64(
- v->call, (struct AFSFid*)&avc->f.fid.Fid,
- &v->InStatus, base, bytes, length);
- else
+ v->call, (struct AFSFid*)&avc->f.fid.Fid,
+ &v->InStatus, base, bytes, length);
+ else {
if (length > 0xFFFFFFFF)
code = EFBIG;
else {
(struct AFSFid *) &avc->f.fid.Fid,
&v->InStatus, t1, t2, t3);
}
+ v->hasNo64bit = 1;
+ }
#else /* AFS_64BIT_CLIENT */
code = StartRXAFS_StoreData(v->call, (struct AFSFid *)&avc->f.fid.Fid,
&v->InStatus, base, bytes, length);
{
int *shouldwake = NULL;
unsigned int i;
+ int stored = 0;
afs_int32 code = 0;
afs_size_t bytesXferred;
afs_size_t bytesToXfer = 10000; /* # bytes to xfer */
#endif /* AFS_NOSTATS */
XSTATS_DECLS;
+ osi_Assert(nchunks != 0);
for (i = 0; i < nchunks && !code; i++) {
- int stored = 0;
struct dcache *tdc = dclist[i];
- afs_int32 size = tdc->f.chunkBytes;
+ afs_int32 size;
+
if (!tdc) {
afs_warn("afs: missing dcache!\n");
storeallmissing++;
continue; /* panic? */
}
+ size = tdc->f.chunkBytes;
afs_Trace4(afs_iclSetp, CM_TRACE_STOREALL2, ICL_TYPE_POINTER, avc,
ICL_TYPE_INT32, tdc->f.chunk, ICL_TYPE_INT32, tdc->index,
ICL_TYPE_INT32, afs_inode2trace(&tdc->f.inode));
#ifndef AFS_NOSTATS
FillStoreStats(code, AFS_STATS_FS_XFERIDX_STOREDATA,
- &xferStartTime, bytesToXfer, bytesXferred);
+ xferStartTime, bytesToXfer, bytesXferred);
#endif /* AFS_NOSTATS */
if ((tdc->f.chunkBytes < afs_OtherCSize)
if (!code) {
code = (*ops->close)(rock, OutStatus, doProcessFS);
+ /* if this succeeds, dv has been bumped. */
if (*doProcessFS) {
hadd32(*anewDV, 1);
}
}
if (ops)
code = (*ops->destroy)(&rock, code);
+
+ /* if we errored, can't trust this. */
+ if (code)
+ *doProcessFS = 0;
+
return code;
}
int nomore;
unsigned int first = 0;
struct afs_conn *tc;
+ struct rx_connection *rxconn;
for (bytes = 0, j = 0; !code && j <= high; j++) {
if (dcList[j]) {
ICL_HANDLE_OFFSET(length));
do {
- tc = afs_Conn(&avc->f.fid, areq, 0);
+ tc = afs_Conn(&avc->f.fid, areq, 0, &rxconn);
#ifdef AFS_64BIT_CLIENT
restart:
#endif
- code = rxfs_storeInit(avc, tc, base, bytes, length,
+ code = rxfs_storeInit(avc, tc, rxconn, base, bytes, length,
sync, &ops, &rock);
if ( !code ) {
code = afs_CacheStoreDCaches(avc, dclist, bytes, anewDV,
}
#endif /* AFS_64BIT_CLIENT */
} while (afs_Analyze
- (tc, code, &avc->f.fid, areq,
+ (tc, rxconn, code, &avc->f.fid, areq,
AFS_STATS_FS_RPCIDX_STOREDATA, SHARED_LOCK,
NULL));
};
afs_int32
-rxfs_fetchInit(struct afs_conn *tc, struct vcache *avc, afs_offs_t base,
+rxfs_fetchInit(struct afs_conn *tc, struct rx_connection *rxconn,
+ struct vcache *avc, afs_offs_t base,
afs_uint32 size, afs_int32 *alength, struct dcache *adc,
struct osi_file *fP, struct fetchOps **ops, void **rock)
{
memset(v, 0, sizeof(struct rxfs_fetchVariables));
RX_AFS_GUNLOCK();
- v->call = rx_NewCall(tc->id);
+ v->call = rx_NewCall(rxconn);
RX_AFS_GLOCK();
if (v->call) {
#ifdef AFS_64BIT_CLIENT
pos = base;
RX_AFS_GUNLOCK();
if (!v->call)
- v->call = rx_NewCall(tc->id);
+ v->call = rx_NewCall(rxconn);
code =
StartRXAFS_FetchData(
v->call, (struct AFSFid*)&avc->f.fid.Fid,
RX_AFS_GLOCK();
}
afs_serverSetNo64Bit(tc);
+ v->hasNo64bit = 1;
}
- if (!code) {
+ if (code) {
+ goto err;
+ } else {
RX_AFS_GUNLOCK();
bytes = rx_Read(v->call, (char *)&length, sizeof(afs_int32));
RX_AFS_GLOCK();
code = EIO;
}
+err:
if (!code && code1)
code = code1;
* Routine called on fetch; also tells people waiting for data
* that more has arrived.
*
- * \param tc Ptr to the Rx connection structure.
+ * \param tc Ptr to the AFS connection structure.
+ * \param rxconn Ptr to the Rx connection structure.
* \param fP File descriptor for the cache file.
* \param base Base offset to fetch.
* \param adc Ptr to the dcache entry for the file, write-locked.
* \note Environment: Nothing interesting.
*/
int
-afs_CacheFetchProc(struct afs_conn *tc, struct osi_file *fP, afs_size_t base,
+afs_CacheFetchProc(struct afs_conn *tc, struct rx_connection *rxconn,
+ struct osi_file *fP, afs_size_t base,
struct dcache *adc, struct vcache *avc, afs_int32 size,
struct afs_FetchOutput *tsmall)
{
* adc->lock(W)
*/
code = rxfs_fetchInit(
- tc, avc, base, size, &length, adc, fP, &ops, &rock);
+ tc, rxconn, avc, base, size, &length, adc, fP, &ops, &rock);
#ifndef AFS_NOSTATS
osi_GetuTime(&xferStartTime);
#endif /* AFS_NOSTATS */
- if (adc) {
- adc->validPos = base;
- }
+ adc->validPos = base;
if ( !code ) do {
if (avc->f.states & CForeign) {
(*ops->destroy)(&rock, code);
#ifndef AFS_NOSTATS
- FillStoreStats(code, AFS_STATS_FS_XFERIDX_FETCHDATA, &xferStartTime,
+ FillStoreStats(code, AFS_STATS_FS_XFERIDX_FETCHDATA, xferStartTime,
bytesToXfer, bytesXferred);
#endif
XSTATS_END_TIME;
git://git.openafs.org / openafs.git / blobdiff