o5r/plan9port
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

venti: disk i/o fixes and tweaks

Browse source
This commit is contained in:
Russ Cox 2008-12-23 12:39:06 -08:00
parent 3b06b75766
commit afaa1397f3
1 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/cmd/venti/srv/part.c
View file

@ -141,10 +141,13 @@ initpart(char *name, int mode)
} }
if(dir->length == 0){ if(dir->length == 0){
free(dir); free(dir);
freepart(part); dir = dirstat(file);
seterr(EOk, "can't determine size of partition %s", file); if(dir == nil || dir->length == 0) {
free(file); freepart(part);
return nil; seterr(EOk, "can't determine size of partition %s", file);
free(file);
return nil;
}
} }
if(dir->length < hi || dir->length < lo){ if(dir->length < hi || dir->length < lo){
freepart(part); freepart(part);
@ -159,7 +162,7 @@ initpart(char *name, int mode)
#ifdef CANBLOCKSIZE #ifdef CANBLOCKSIZE
{ {
struct statfs sfs; struct statfs sfs;
if(fstatfs(part->fd, &sfs) >= 0) if(fstatfs(part->fd, &sfs) >= 0 && sfs.f_bsize > 512)
part->fsblocksize = sfs.f_bsize; part->fsblocksize = sfs.f_bsize;
} }
#endif #endif
@ -229,7 +232,7 @@ prwb(char *name, int fd, int isread, u64int offset, void *vbuf, u32int count, u3
char *op; char *op;
u8int *buf, *freetmp, *dst; u8int *buf, *freetmp, *dst;
u32int icount, opsize; u32int icount, opsize;
int r; int r, count1;
#ifndef PLAN9PORT #ifndef PLAN9PORT
@ -286,6 +289,7 @@ prwb(char *name, int fd, int isread, u64int offset, void *vbuf, u32int count, u3
dst = tmp; dst = tmp;
offset = offset-delta; offset = offset-delta;
op = "read"; op = "read";
count1 = blocksize;
goto Error; goto Error;
} }
c = min(count, blocksize-delta); c = min(count, blocksize-delta);
@ -298,6 +302,7 @@ prwb(char *name, int fd, int isread, u64int offset, void *vbuf, u32int count, u3
dst = tmp; dst = tmp;
offset = offset-delta; offset = offset-delta;
op = "read"; op = "read";
count1 = blocksize;
goto Error; goto Error;
} }
} }
@ -323,6 +328,7 @@ prwb(char *name, int fd, int isread, u64int offset, void *vbuf, u32int count, u3
if(isread){ if(isread){
if((r=pread(fd, dst, opsize, offset))<=0 || r%blocksize){ if((r=pread(fd, dst, opsize, offset))<=0 || r%blocksize){
op = "read"; op = "read";
count1 = opsize;
goto Error; goto Error;
} }
if(dst == tmp){ if(dst == tmp){
@ -335,6 +341,7 @@ prwb(char *name, int fd, int isread, u64int offset, void *vbuf, u32int count, u3
memmove(dst, buf, blocksize); memmove(dst, buf, blocksize);
} }
if((r=pwrite(fd, dst, opsize, offset))<=0 || r%blocksize){ if((r=pwrite(fd, dst, opsize, offset))<=0 || r%blocksize){
count1 = opsize;
op = "write"; op = "write";
goto Error; goto Error;
} }
@ -362,14 +369,16 @@ prwb(char *name, int fd, int isread, u64int offset, void *vbuf, u32int count, u3
print("FAILED isread=%d r=%d count=%d blocksize=%d\n", isread, r, count, blocksize); print("FAILED isread=%d r=%d count=%d blocksize=%d\n", isread, r, count, blocksize);
dst = tmp; dst = tmp;
op = "read"; op = "read";
count1 = blocksize;
goto Error; goto Error;
} }
if(isread) if(isread)
memmove(buf, tmp, count); memmove(buf, tmp, count);
else{ else{
memmove(tmp, buf, count); memmove(tmp, buf, count);
if(pwrite(fd, tmp, opsize, offset) != blocksize){ if(pwrite(fd, tmp, blocksize, offset) != blocksize){
dst = tmp; dst = tmp;
count1 = blocksize;
op = "write"; op = "write";
goto Error; goto Error;
} }
@ -382,7 +391,7 @@ print("FAILED isread=%d r=%d count=%d blocksize=%d\n", isread, r, count, blocksi
Error: Error:
seterr(EAdmin, "%s %s offset 0x%llux count %ud buf %p returned %d: %r", seterr(EAdmin, "%s %s offset 0x%llux count %ud buf %p returned %d: %r",
op, name, offset, opsize, dst, r); op, name, offset, count1, dst, r);
if(freetmp) if(freetmp)
free(freetmp); free(freetmp);
return -1; return -1;