X-Git-Url: https://git.wh0rd.org/?p=dump.git;a=blobdiff_plain;f=dump%2Ftape.c;h=644ed8a2ba92ab6a555598b1c234086f6f34cf4c;hp=8d8933f6eea8079fcf87e719101142e6bc5a97a3;hb=caea5c768eb239f9b987791f0c665b10d7550741;hpb=88ef261eaffd1b09f23eb73d8259336f694d9324 diff --git a/dump/tape.c b/dump/tape.c index 8d8933f..644ed8a 100644 --- a/dump/tape.c +++ b/dump/tape.c @@ -41,7 +41,7 @@ #ifndef lint static const char rcsid[] = - "$Id: tape.c,v 1.54 2001/08/16 15:24:21 stelian Exp $"; + "$Id: tape.c,v 1.56 2001/09/12 09:02:51 stelian Exp $"; #endif /* not lint */ #include @@ -68,10 +68,12 @@ int write(), read(); #endif #include #include -#include #include #include #ifdef __linux__ +#include +#undef atomic_read /* this get wrongly defined in kernel */ + /* headers and we don't want it */ #ifdef HAVE_EXT2FS_EXT2_FS_H #include #else @@ -562,7 +564,7 @@ close_rewind(void) void rollforward(void) { - register struct req *p, *q, *prev; + register struct req *p, *q = NULL, *prev; register struct slave *tslp; int i, size, savedtapea, got; union u_spcl *ntb, *otb; @@ -1046,6 +1048,9 @@ doslave(int cmd, int slave_number, int first) if ((diskfd = OPEN(disk, O_RDONLY)) < 0) quit("slave couldn't reopen disk: %s\n", strerror(errno)); #ifdef __linux__ +#ifdef BLKFLSBUF + (void)ioctl(diskfd, BLKFLSBUF); +#endif ext2fs_close(fs); retval = dump_fs_open(disk, &fs); if (retval)