From 876861d20fbf12cfef3768496a90b395cd15ea9a Mon Sep 17 00:00:00 2001 From: Stelian Pop Date: Mon, 2 Sep 2002 12:43:12 +0000 Subject: [PATCH] Raised the -b maximal value to 1024. --- CHANGES | 7 ++++++- THANKS | 3 ++- dump/dump.8.in | 21 ++++++++++----------- dump/main.c | 6 +++--- 4 files changed, 21 insertions(+), 16 deletions(-) diff --git a/CHANGES b/CHANGES index 6ca199e..dc1f613 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,4 @@ -$Id: CHANGES,v 1.194 2002/09/02 12:20:26 stelian Exp $ +$Id: CHANGES,v 1.195 2002/09/02 12:43:12 stelian Exp $ Changes between versions 0.4b31 and 0.4b32 (released ?????????????) =================================================================== @@ -19,6 +19,11 @@ Changes between versions 0.4b31 and 0.4b32 (released ?????????????) 3. Fixed dump's estimate when dealing with sparse inodes. +4. Modified dump to allow setting a blocksize bigger than 32kB + (raised the limit to 1024kB), because newer hardware needs + this for proper operation. Thanks to Dirk Traenapp + for reporting this. + Changes between versions 0.4b30 and 0.4b31 (released July 30, 2002) =================================================================== diff --git a/THANKS b/THANKS index 24883ac..a4a6ea3 100644 --- a/THANKS +++ b/THANKS @@ -1,4 +1,4 @@ -$Id: THANKS,v 1.66 2002/08/18 20:52:04 stelian Exp $ +$Id: THANKS,v 1.67 2002/09/02 12:44:03 stelian Exp $ Dump and restore were written by the people of the CSRG at the University of California, Berkeley. @@ -94,6 +94,7 @@ Clemens Stiglechner a9401816@unet.univie.ac.at Matti Taskinen mkt@rni.helsinki.fi Jason L Tibbitts III tibbs@math.uh.edu Mike Tibor tibor@lib.uaa.alaska.edu +Dirk Traenapp dtraenapp@users.sourceforge.net Erik Troan ewt@redhat.com Theodore Y. Ts'o tytso@valinux.com Stephen Tweedie sct@dcs.ed.ac.uk diff --git a/dump/dump.8.in b/dump/dump.8.in index c92f90c..25819a2 100644 --- a/dump/dump.8.in +++ b/dump/dump.8.in @@ -30,7 +30,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: dump.8.in,v 1.44 2002/07/24 14:12:00 stelian Exp $ +.\" $Id: dump.8.in,v 1.45 2002/09/02 12:43:12 stelian Exp $ .\" .TH DUMP 8 "version __VERSION__ of __DATE__" BSD "System management commands" .SH NAME @@ -115,17 +115,16 @@ to be used by to determine whether a file is in the dump file that is being restored. .TP .BI \-b " blocksize" -The number of kilobytes per dump record. Since the IO system slices all -requests into chunks of +The number of kilobytes per dump record. The default blocksize is 10 +and the maximal value is 1024. +Note however that, since the IO system slices all requests into chunks +of .B MAXBSIZE -(typically 64kB), it is not possible to use a larger blocksize without having -problems later with -.BR restore (8). -Therefore -.B dump -will constrain writes to -.B MAXBSIZE. -The default blocksize is 10. +(which can be as low as 64kB), you can experience problems with +.BR dump (8) +and +.BR restore (8) +when using a higher value, depending on your kernel and/or libC versions. .TP .BI \-B " records" The number of 1 kB blocks per volume. Not normally required, as diff --git a/dump/main.c b/dump/main.c index d06c2fd..ebfab4f 100644 --- a/dump/main.c +++ b/dump/main.c @@ -41,7 +41,7 @@ #ifndef lint static const char rcsid[] = - "$Id: main.c,v 1.74 2002/07/19 14:57:39 stelian Exp $"; + "$Id: main.c,v 1.75 2002/09/02 12:43:12 stelian Exp $"; #endif /* not lint */ #include @@ -181,7 +181,7 @@ long uncomprblks = 0;/* uncompressed blocks written */ char *__progname; #endif -int maxbsize = 64*1024; /* XXX MAXBSIZE from sys/param.h */ +int maxbsize = 1024*1024; /* XXX MAXBSIZE from sys/param.h */ static long numarg __P((const char *, long, long)); static void obsolete __P((int *, char **[])); static void usage __P((void)); @@ -293,7 +293,7 @@ main(int argc, char *argv[]) case 'b': /* blocks per tape write */ ntrec = numarg("number of blocks per write", - 1L, 1000L); + 1L, 1048576L); if (ntrec > maxbsize/1024) { msg("Please choose a blocksize <= %dkB\n", maxbsize/1024); -- 2.39.5