X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=device-src%2Fxfer-dest-taper-cacher.c;h=faf8309a0ca21768ad3fd4a969b9c259325c7d6e;hb=691567b16c13087b31ee4c2b6d038e57872fae82;hp=75643047b3b98f065fe2e82c1d1466505e12ba99;hpb=8eb7e8e19f1373f6be7f1f7837b997748ce31d0e;p=debian%2Famanda diff --git a/device-src/xfer-dest-taper-cacher.c b/device-src/xfer-dest-taper-cacher.c index 7564304..faf8309 100644 --- a/device-src/xfer-dest-taper-cacher.c +++ b/device-src/xfer-dest-taper-cacher.c @@ -1,10 +1,11 @@ /* * 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 - * by the Free Software Foundation. + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY @@ -1328,7 +1329,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