From 61e9d4ff6082c1c460bac40ff15c62839278dd48 Mon Sep 17 00:00:00 2001 From: Stelian Pop Date: Wed, 9 Apr 2003 10:42:56 +0000 Subject: [PATCH] Made dump work with new Linux 2.5 EOT early warning semantics. --- CHANGES | 5 ++++- THANKS | 4 +++- dump/tape.c | 9 +++++---- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/CHANGES b/CHANGES index 69614b8..67ed8b1 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,4 @@ -$Id: CHANGES,v 1.225 2003/04/08 19:52:30 stelian Exp $ +$Id: CHANGES,v 1.226 2003/04/09 10:42:56 stelian Exp $ Changes between versions 0.4b33 and 0.4b34 (released ?????????????????) ======================================================================= @@ -84,6 +84,9 @@ Changes between versions 0.4b33 and 0.4b34 (released ?????????????????) how to enable and configure it. Thanks to Ken Lalonde for the patch. +19. Made dump work with 2.5 kernel end of tape early warning semantics. + Thanks to Kai Makisara for the patch. + Changes between versions 0.4b32 and 0.4b33 (released February 10, 2003) ======================================================================= diff --git a/THANKS b/THANKS index 9bb35e5..5ac33c5 100644 --- a/THANKS +++ b/THANKS @@ -1,4 +1,4 @@ -$Id: THANKS,v 1.78 2003/03/07 09:15:46 stelian Exp $ +$Id: THANKS,v 1.79 2003/04/09 10:42:57 stelian Exp $ Dump and restore were written by the people of the CSRG at the University of California, Berkeley. @@ -64,6 +64,7 @@ Henry Katz hkatz@hkatz.dialup.access.net Dragan Krnic dkrnic@lycos.com Klaus Kudielka kkudielk@cacofonix.nt.tuwien.ac.at Thorsten Kukuk kukuk@suse.de +Ken Lalonde ken@globalremit.com Florian La Roche florian@jurix.jura.uni-sb.de Kari Lempiainen kari@funky.pp.fi Ambrose Li acli@mingpaoxpress.com @@ -71,6 +72,7 @@ Georg Lippold g_lippold@sourceforge.net Patrick J. LoPresti patl@cag.lcs.mit.edu Greg Lutz greglutz@ix.netcom.com Eric Maisonobe virnet@nat.fr +Kai Makisara Kai.Makisara@kolumbus.fi Andy Mentges amentges@jumpline.com David Miller davem@caip.rutgers.edu Elliott Mitchell ehem@m5p.com diff --git a/dump/tape.c b/dump/tape.c index 5e91602..d80e49a 100644 --- a/dump/tape.c +++ b/dump/tape.c @@ -37,7 +37,7 @@ #ifndef lint static const char rcsid[] = - "$Id: tape.c,v 1.75 2003/03/31 09:42:58 stelian Exp $"; + "$Id: tape.c,v 1.76 2003/04/09 10:42:57 stelian Exp $"; #endif /* not lint */ #include @@ -1309,11 +1309,12 @@ doslave(int cmd, #ifdef WRITEDEBUG printf("slave %d wrote %d\n", slave_number, wrote); #endif - if (wrote < 0) + if (wrote < 0 && errno != ENOSPC) break; - if (wrote == 0) + if (wrote == 0 || (wrote < 0 && errno == ENOSPC)) eot_count++; - size += wrote; + else + size += wrote; } #ifdef WRITEDEBUG -- 2.39.2