Merge tag 'upstream/3.3.2'

[debian/amanda] / device-src / xfer-dest-taper-cacher.c

diff --git a/device-src/xfer-dest-taper-cacher.c b/device-src/xfer-dest-taper-cacher.c
index 75643047b3b98f065fe2e82c1d1466505e12ba99..0bf02cd8a68901e6012feb09bea628b2652b0643 100644 (file)
--- a/device-src/xfer-dest-taper-cacher.c
+++ b/device-src/xfer-dest-taper-cacher.c
@@ -1,6 +1,6 @@
 /*
  * Amanda, The Advanced Maryland Automatic Network Disk Archiver
- * Copyright (c) 2009, 2010 Zmanda, Inc.  All Rights Reserved.
+ * Copyright (c) 2009-2012 Zmanda, Inc.  All Rights Reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
@@ -1328,7 +1328,12 @@ get_part_bytes_written_impl(
     /* NOTE: this access is unsafe and may return inconsistent results (e.g, a
      * partial write to the 64-bit value on a 32-bit system).  This is ok for
      * the moment, as it's only informational, but be warned. */
-    return self->bytes_written + self->slab_bytes_written;
+    if (self->device) {
+       return device_get_bytes_written(self->device);
+    } else {
+       return self->bytes_written + self->slab_bytes_written;
+    }
+
 }
 
 static void