Return -1: * on all failures of fdatasync. Instead of propagating -errno all the way up to the virStorageVolWipe API, which is documented to return 0 or -1. * after a partial wipe. If safewrite failed, we would re-use the non-negative return value of lseek (which should be 0 in this case, because that's the only offset we seek to). --- src/storage/storage_backend.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index 6915b8a..f62ebff 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -2002,7 +2002,7 @@ virStorageBackendWipeExtentLocal(virStorageVolDefPtr vol, VIR_DEBUG("extent logical start: %ju len: %ju", (uintmax_t)extent_start, (uintmax_t)extent_length); - if ((ret = lseek(fd, extent_start, SEEK_SET)) < 0) { + if (lseek(fd, extent_start, SEEK_SET) < 0) { virReportSystemError(errno, _("Failed to seek to position %ju in volume " "with path '%s'"), @@ -2029,7 +2029,6 @@ virStorageBackendWipeExtentLocal(virStorageVolDefPtr vol, } if (fdatasync(fd) < 0) { - ret = -errno; virReportSystemError(errno, _("cannot sync data to volume with path '%s'"), vol->target.path); -- 2.4.6

The only caller always passes 0 for the extent start. Drop the 'extent_start' parameter, as well as the mention of extents from the function name. --- src/storage/storage_backend.c | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index 120d654..d1276dd 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -1987,29 +1987,28 @@ virStorageBackendVolZeroSparseFileLocal(virStorageVolDefPtr vol, static int -virStorageBackendWipeExtentLocal(virStorageVolDefPtr vol, - int fd, - off_t extent_start, - off_t extent_length, - size_t writebuf_length, - size_t *bytes_wiped) +virStorageBackendWipeLocal(virStorageVolDefPtr vol, + int fd, + off_t extent_length, + size_t writebuf_length, + size_t *bytes_wiped) { int ret = -1, written = 0; off_t remaining = 0; size_t write_size = 0; char *writebuf = NULL; - VIR_DEBUG("extent logical start: %ju len: %ju", - (uintmax_t)extent_start, (uintmax_t)extent_length); + VIR_DEBUG("extent logical start: 0 len: %ju", + (uintmax_t)extent_length); if (VIR_ALLOC_N(writebuf, writebuf_length) < 0) goto cleanup; - if (lseek(fd, extent_start, SEEK_SET) < 0) { + if (lseek(fd, 0, SEEK_SET) < 0) { virReportSystemError(errno, - _("Failed to seek to position %ju in volume " + _("Failed to seek to the start in volume " "with path '%s'"), - (uintmax_t)extent_start, vol->target.path); + vol->target.path); goto cleanup; } @@ -2126,12 +2125,11 @@ virStorageBackendVolWipeLocal(virConnectPtr conn ATTRIBUTE_UNUSED, if (S_ISREG(st.st_mode) && st.st_blocks < (st.st_size / DEV_BSIZE)) { ret = virStorageBackendVolZeroSparseFileLocal(vol, st.st_size, fd); } else { - ret = virStorageBackendWipeExtentLocal(vol, - fd, - 0, - vol->target.allocation, - st.st_blksize, - &bytes_wiped); + ret = virStorageBackendWipeLocal(vol, + fd, + vol->target.allocation, + st.st_blksize, + &bytes_wiped); } } -- 2.4.6

Change off_t extent_length to unsigned long long wipe_len, as well as the 'remain' variable. --- src/storage/storage_backend.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index d1276dd..530177f 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -1989,17 +1989,16 @@ virStorageBackendVolZeroSparseFileLocal(virStorageVolDefPtr vol, static int virStorageBackendWipeLocal(virStorageVolDefPtr vol, int fd, - off_t extent_length, + unsigned long long wipe_len, size_t writebuf_length, size_t *bytes_wiped) { int ret = -1, written = 0; - off_t remaining = 0; + unsigned long long remaining = 0; size_t write_size = 0; char *writebuf = NULL; - VIR_DEBUG("extent logical start: 0 len: %ju", - (uintmax_t)extent_length); + VIR_DEBUG("wiping start: 0 len: %llu", wipe_len); if (VIR_ALLOC_N(writebuf, writebuf_length) < 0) goto cleanup; @@ -2012,7 +2011,7 @@ virStorageBackendWipeLocal(virStorageVolDefPtr vol, goto cleanup; } - remaining = extent_length; + remaining = wipe_len; while (remaining > 0) { write_size = (writebuf_length < remaining) ? writebuf_length : remaining; -- 2.4.6