#include "afs/sysincludes.h"
#include "afsincludes.h"
#if !defined(UKERNEL)
-#include "h/param.h"
+#if !defined(AFS_LINUX26_ENV)
+# include "h/param.h"
+#endif
#include "h/types.h"
#include "h/time.h"
#if defined(AFS_AIX31_ENV)
ObtainWriteLock(&tb->lock, 260);
tb->lockers++;
ReleaseWriteLock(&afs_bufferLock);
- if (page * AFS_BUFFER_PAGESIZE >= adc->f.chunkBytes) {
- tb->fid = NULLIDX;
- afs_reset_inode(&tb->inode);
- tb->lockers--;
- ReleaseWriteLock(&tb->lock);
- return EIO;
+ code = 0;
+ if (adc->f.chunk == 0 && adc->f.chunkBytes == 0) {
+ /* The directory blob is empty, apparently. This is not a valid dir
+ * blob, so throw an error. */
+ code = EIO;
+ goto error;
+ } else if (page * AFS_BUFFER_PAGESIZE >= adc->f.chunkBytes) {
+ code = ENOENT; /* past the end */
+ goto error;
}
+
tfile = afs_CFileOpen(&adc->f.inode);
+ if (!tfile) {
+ code = EIO;
+ goto error;
+ }
code =
afs_CFileRead(tfile, tb->page * AFS_BUFFER_PAGESIZE, tb->data,
AFS_BUFFER_PAGESIZE);
afs_CFileClose(tfile);
if (code < AFS_BUFFER_PAGESIZE) {
- tb->fid = NULLIDX;
- afs_reset_inode(&tb->inode);
- tb->lockers--;
- ReleaseWriteLock(&tb->lock);
- return EIO;
+ code = EIO;
+ goto error;
}
/* Note that findslot sets the page field in the buffer equal to
* what it is searching for. */
entry->buffer = tb;
entry->data = tb->data;
return 0;
+
+ error:
+ tb->fid = NULLIDX;
+ afs_reset_inode(&tb->inode);
+ tb->lockers--;
+ ReleaseWriteLock(&tb->lock);
+ return code;
}
static void
if (lp->dirty) {
/* see DFlush for rationale for not getting and locking the dcache */
tfile = afs_CFileOpen(&lp->inode);
+ if (!tfile)
+ return NULL; /* Callers will flag as EIO */
+
afs_CFileWrite(tfile, lp->page * AFS_BUFFER_PAGESIZE, lp->data,
AFS_BUFFER_PAGESIZE);
lp->dirty = 0;
AFS_STATS(afs_stats_cmperf.bufFlushDirty++);
}
+ /* Zero out the data so we don't leak something we shouldn't. */
+ memset(lp->data, 0, AFS_BUFFER_PAGESIZE);
/* Now fill in the header. */
lp->fid = adc->index;
afs_copy_inode(&lp->inode, &adc->f.inode);
struct osi_file *tfile;
tfile = afs_CFileOpen(&ab->inode);
+ osi_Assert(tfile);
afs_CFileWrite(tfile, ab->page * AFS_BUFFER_PAGESIZE,
ab->data, AFS_BUFFER_PAGESIZE);
ab->dirty = 0; /* Clear the dirty flag */
* DFlush due to lock hierarchy issues */
if ((page + 1) * AFS_BUFFER_PAGESIZE > adc->f.chunkBytes) {
afs_AdjustSize(adc, (page + 1) * AFS_BUFFER_PAGESIZE);
- afs_WriteDCache(adc, 1);
+ osi_Assert(afs_WriteDCache(adc, 1) == 0);
}
ObtainWriteLock(&tb->lock, 265);
tb->lockers++;
AFS_STATCNT(shutdown_bufferpackage);
/* Free all allocated Buffers and associated buffer pages */
DFlush();
+
+ dinit_flag = 0;
+ tp = Buffers;
+ for (i = 0; i < nbuffers; i += NPB, tp += NPB) {
+ afs_osi_Free(tp->data, NPB * AFS_BUFFER_PAGESIZE);
+ }
+ afs_osi_Free(Buffers, nbuffers * sizeof(struct buffer));
+ Buffers = NULL;
+ nbuffers = 0;
+ timecounter = 1;
+ for (i = 0; i < PHSIZE; i++)
+ phTable[i] = NULL;
+
if (afs_cold_shutdown) {
- dinit_flag = 0;
- tp = Buffers;
- for (i = 0; i < nbuffers; i += NPB, tp += NPB) {
- afs_osi_Free(tp->data, NPB * AFS_BUFFER_PAGESIZE);
- }
- afs_osi_Free(Buffers, nbuffers * sizeof(struct buffer));
- nbuffers = 0;
- timecounter = 1;
- for (i = 0; i < PHSIZE; i++)
- phTable[i] = 0;
memset(&afs_bufferLock, 0, sizeof(afs_lock_t));
}
}