d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Readjust the cache initialization code to make it more obvious that the

Browse Source 
cache is bypassed when disabled.
This commit is contained in:
Matthew Dillon 2003-01-25 19:06:30 +00:00
parent d923c5986e
commit 049b1245be
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=109825
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sbin/dump/cache.c
View File

@ -88,14 +88,14 @@ cread(int fd, void *buf, size_t nbytes, off_t offset)
off_t mask;
/*
* If the cache is disabled, revert to pread. If the
* cache has not been initialized, initialize the cache.
* If the cache is disabled, or we do not yet know the filesystem
* block size, then revert to pread. Otherwise initialize the
* cache as necessary and continue.
*/
if (sblock->fs_bsize && DataBase == NULL) {
if (cachesize <= 0)
return(pread(fd, buf, nbytes, offset));
if (cachesize <= 0 || sblock->fs_bsize == 0)
return(pread(fd, buf, nbytes, offset));
if (DataBase == NULL)
cinit();
}
/*
* If the request crosses a cache block boundary, or the
@ -118,13 +118,8 @@ cread(int fd, void *buf, size_t nbytes, off_t offset)
pblk = &BlockHash[hi];
ppblk = NULL;
while ((blk = *pblk) != NULL) {
if (((blk->b_Offset ^ offset) & mask) == 0) {
#if 0
fprintf(stderr, "%08llx %d (%08x)\n", offset, nbytes,
sblock->fs_size * sblock->fs_fsize);
#endif
if (((blk->b_Offset ^ offset) & mask) == 0)
break;
}
ppblk = pblk;
pblk = &blk->b_HNext;
}