cirno/plan9port
1
0
Fork 0
mirror of https://github.com/9fans/plan9port.git synced 2025-01-12 11:10:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

add very big file support (David Swasey)

Browse source
This commit is contained in:
rsc 2007-03-25 17:35:08 +00:00
parent 8f57d0d0d9
commit b109049fbd
2 changed files with 34 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
src/libdiskfs/ext2.c
View file

@ -167,7 +167,7 @@ ext2fileblock(Ext2 *fs, Inode *ino, u32int bno, int size)
int ppb; int ppb;
Block *b; Block *b;
u32int *a; u32int *a;
u32int obno; u32int obno, pbno;
obno = bno; obno = bno;
if(bno < NDIRBLOCKS){ if(bno < NDIRBLOCKS){
@ -185,7 +185,7 @@ ext2fileblock(Ext2 *fs, Inode *ino, u32int bno, int size)
if(b == nil) if(b == nil)
return nil; return nil;
a = (u32int*)b->data; a = (u32int*)b->data;
bno = a[bno%ppb]; bno = a[bno];
blockput(b); blockput(b);
return ext2datablock(fs, bno, size); return ext2datablock(fs, bno, size);
} }
@ -197,13 +197,14 @@ ext2fileblock(Ext2 *fs, Inode *ino, u32int bno, int size)
if(b == nil) if(b == nil)
return nil; return nil;
a = (u32int*)b->data; a = (u32int*)b->data;
bno = a[(bno/ppb)%ppb]; pbno = a[bno/ppb];
bno = bno%ppb;
blockput(b); blockput(b);
b = ext2datablock(fs, bno, fs->blocksize); b = ext2datablock(fs, pbno, fs->blocksize);
if(b == nil) if(b == nil)
return nil; return nil;
a = (u32int*)b->data; a = (u32int*)b->data;
bno = a[bno%ppb]; bno = a[bno];
blockput(b); blockput(b);
return ext2datablock(fs, bno, size); return ext2datablock(fs, bno, size);
} }
@ -215,19 +216,21 @@ ext2fileblock(Ext2 *fs, Inode *ino, u32int bno, int size)
if(b == nil) if(b == nil)
return nil; return nil;
a = (u32int*)b->data; a = (u32int*)b->data;
bno = a[(bno/(ppb*ppb))%ppb]; pbno = a[bno/(ppb*ppb)];
bno = bno%(ppb*ppb);
blockput(b); blockput(b);
b = ext2datablock(fs, bno, fs->blocksize); b = ext2datablock(fs, pbno, fs->blocksize);
if(b == nil) if(b == nil)
return nil; return nil;
a = (u32int*)b->data; a = (u32int*)b->data;
bno = a[(bno/ppb)%ppb]; pbno = a[bno/ppb];
bno = bno%ppb;
blockput(b); blockput(b);
b = ext2datablock(fs, bno, fs->blocksize); b = ext2datablock(fs, pbno, fs->blocksize);
if(b == nil) if(b == nil)
return nil; return nil;
a = (u32int*)b->data; a = (u32int*)b->data;
bno = a[bno%ppb]; bno = a[bno];
blockput(b); blockput(b);
return ext2datablock(fs, bno, size); return ext2datablock(fs, bno, size);
} }
@ -351,6 +354,17 @@ ext2root(Fsys *fsys, Nfs3Handle *h)
return Nfs3Ok; return Nfs3Ok;
} }
static u64int
inosize(Inode* ino)
{
u64int size;
size = ino->size;
if((ino->mode&IFMT)==IFREG)
size |= (u64int)ino->diracl << 32;
return size;
}
static Nfs3Status static Nfs3Status
ino2attr(Ext2 *fs, Inode *ino, u32int inum, Nfs3Attr *attr) ino2attr(Ext2 *fs, Inode *ino, u32int inum, Nfs3Attr *attr)
{ {
@ -388,8 +402,8 @@ ino2attr(Ext2 *fs, Inode *ino, u32int inum, Nfs3Attr *attr)
attr->nlink = ino->nlink; attr->nlink = ino->nlink;
attr->uid = ino->uid; attr->uid = ino->uid;
attr->gid = ino->gid; attr->gid = ino->gid;
attr->size = ino->size; attr->size = inosize(ino);
attr->used = ino->nblock*fs->blocksize; attr->used = (u64int)ino->nblock*fs->blocksize;
if(attr->type==Nfs3FileBlock || attr->type==Nfs3FileChar){ if(attr->type==Nfs3FileBlock || attr->type==Nfs3FileChar){
rdev = ino->block[0]; rdev = ino->block[0];
attr->major = (rdev>>8)&0xFF; attr->major = (rdev>>8)&0xFF;
@ -659,6 +673,7 @@ ext2readfile(Fsys *fsys, SunAuthUnix *au, Nfs3Handle *h, u32int count,
int skip1, tot, want, fragcount; int skip1, tot, want, fragcount;
Inode ino; Inode ino;
Nfs3Status ok; Nfs3Status ok;
u64int size;
fs = fsys->priv; fs = fsys->priv;
if((ok = handle2ino(fs, h, nil, &ino)) != Nfs3Ok) if((ok = handle2ino(fs, h, nil, &ino)) != Nfs3Ok)
@ -667,14 +682,15 @@ ext2readfile(Fsys *fsys, SunAuthUnix *au, Nfs3Handle *h, u32int count,
if((ok = inoperm(&ino, au, AREAD)) != Nfs3Ok) if((ok = inoperm(&ino, au, AREAD)) != Nfs3Ok)
return ok; return ok;
if(offset >= ino.size){ size = inosize(&ino);
if(offset >= size){
*pdata = 0; *pdata = 0;
*pcount = 0; *pcount = 0;
*peof = 1; *peof = 1;
return Nfs3Ok; return Nfs3Ok;
} }
if(offset+count > ino.size) if(offset+count > size)
count = ino.size-offset; count = size-offset;
data = malloc(count); data = malloc(count);
if(data == nil) if(data == nil)
@ -705,7 +721,7 @@ ext2readfile(Fsys *fsys, SunAuthUnix *au, Nfs3Handle *h, u32int count,
} }
count = tot - skip1; count = tot - skip1;
*peof = (offset+count == ino.size); *peof = (offset+count == size);
*pcount = count; *pcount = count;
*pdata = data; *pdata = data;
return Nfs3Ok; return Nfs3Ok;

4
src/libdiskfs/ext2.h
View file

@ -84,7 +84,7 @@ struct Super
}; };
/* /*
* Blcok group on-disk format. * Block group on-disk format.
*/ */
struct Group struct Group
{ {
@ -122,7 +122,7 @@ struct Inode
u32int block[NBLOCKS];/* Pointers to blocks */ u32int block[NBLOCKS];/* Pointers to blocks */
u32int version; /* File version (for NFS) */ u32int version; /* File version (for NFS) */
u32int fileacl; /* File ACL */ u32int fileacl; /* File ACL */
u32int diracl; /* Directory ACL */ u32int diracl; /* Directory ACL or high size bits */
u32int faddr; /* Fragment address */ u32int faddr; /* Fragment address */
uchar osd2[12]; uchar osd2[12];
}; };