Made dump work with new Linux 2.5 EOT early warning semantics.

diff --git a/CHANGES b/CHANGES
index 69614b8fce36f28d3cf9d449e75dcd345d120a70..67ed8b1ddf80324cb7b41c87569a4253ac2eff0a 100644 (file)
--- 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 ?????????????????)
 =======================================================================
 
 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
        <ken@globalremit.com> for the patch.
 
        how to enable and configure it. Thanks to Ken Lalonde
        <ken@globalremit.com> for the patch.
 

+19.    Made dump work with 2.5 kernel end of tape early warning semantics.
+       Thanks to Kai Makisara <Kai.Makisara@kolumbus.fi> for the patch.
+

 Changes between versions 0.4b32 and 0.4b33 (released February 10, 2003)
 =======================================================================
 
 Changes between versions 0.4b32 and 0.4b33 (released February 10, 2003)
 =======================================================================
 

diff --git a/THANKS b/THANKS
index 9bb35e552b33d53b3fd79153e8144e8d3a794886..5ac33c5f7a039f31a69d0bf7af37684e81b6d001 100644 (file)
--- 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.
 
 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
 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
 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
 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
 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 5e91602395b18257b7fabadf9c58f5d185cc082a..d80e49a842464af0432b4c28670bc0243a793c5d 100644 (file)
--- a/dump/tape.c
+++ b/dump/tape.c
@@ -37,7 +37,7 @@
 
 #ifndef lint
 static const char rcsid[] =
 
 #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 <config.h>
 #endif /* not lint */
 
 #include <config.h>


@@ -1309,11 +1309,12 @@ doslave(int cmd,
 #ifdef WRITEDEBUG
                        printf("slave %d wrote %d\n", slave_number, wrote);
 #endif
 #ifdef WRITEDEBUG
                        printf("slave %d wrote %d\n", slave_number, wrote);
 #endif

-                       if (wrote < 0)
+                       if (wrote < 0 && errno != ENOSPC)

                                break;
                                break;

-                       if (wrote == 0)
+                       if (wrote == 0 || (wrote < 0 && errno == ENOSPC))

                                eot_count++;
                                eot_count++;

-                       size += wrote;
+                       else
+                               size += wrote;

                }
 
 #ifdef WRITEDEBUG
                }
 
 #ifdef WRITEDEBUG