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

merge

Browse source
This commit is contained in:
Russ Cox 2007-11-27 15:39:06 -05:00
commit 83ab7d8896
21 changed files with 239 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/cmd/vbackup/diskcat.c
View file

@ -33,7 +33,7 @@ main(int argc, char **argv)
if((disk = diskcache(disk, 16384, 16)) == nil)
sysfatal("diskcache: %r");
if((fsys = fsysopen(disk)) == nil)
sysfatal("ffsopen: %r");
sysfatal("fsysopen: %r");
zero = emalloc(fsys->blocksize);
fprint(2, "%d blocks total\n", fsys->nblock);

2
src/cmd/vbackup/diskftp.c
View file

@ -72,7 +72,7 @@ threadmain(int argc, char **argv)
if((disk = diskcache(disk, 16384, 16)) == nil)
sysfatal("diskcache: %r");
if((fsys = fsysopen(disk)) == nil)
sysfatal("ffsopen: %r");
sysfatal("fsysopen: %r");
allowall = 1;
memset(&au, 0, sizeof au);

2
src/cmd/vbackup/disknfs.c
View file

@ -67,7 +67,7 @@ threadmain(int argc, char **argv)
sysfatal("diskcache: %r");
if((fsys = fsysopen(disk)) == nil)
sysfatal("ffsopen: %r");
sysfatal("fsysopen: %r");
nfs3chan = chancreate(sizeof(SunMsg*), 0);
mountchan = chancreate(sizeof(SunMsg*), 0);

2
src/cmd/vbackup/vbackup.c
View file

@ -164,7 +164,7 @@ threadmain(int argc, char **argv)
if((disk = diskcache(disk, 32768, 2*MAXQ+16)) == nil)
sysfatal("diskcache: %r");
if((fsys = fsysopen(disk)) == nil)
sysfatal("ffsopen: %r");
sysfatal("fsysopen: %r");
/*
* connect to venti

2
src/cmd/vbackup/vcat.c
View file

@ -52,7 +52,7 @@ threadmain(int argc, char **argv)
if((disk = diskopenventi(c, score)) == nil)
sysfatal("diskopenventi: %r");
if((fsys = fsysopen(disk)) == nil)
sysfatal("ffsopen: %r");
sysfatal("fsysopen: %r");
zero = emalloc(fsys->blocksize);
fprint(2, "%d blocks total\n", fsys->nblock);

2
src/cmd/vbackup/vftp.c
View file

@ -418,7 +418,7 @@ threadmain(int argc, char **argv)
sysfatal("diskopenventi: %r");
}
if((fsys = fsysopen(disk)) == nil)
sysfatal("ffsopen: %r");
sysfatal("fsysopen: %r");
fprint(2, "block size %d\n", fsys->blocksize);
buf = emalloc(fsys->blocksize);