External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 11:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

storage: drop 'Extent' from virStorageBackendWipeExtentLocal

Browse Source 
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.

Change off_t extent_length to unsigned long long wipe_len, as well as the
'remain' variable.
This commit is contained in:
Ján Tomko 2015-12-11 17:14:01 +01:00
parent 4bccdf0ceb
commit c3f7371c5e
1 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/storage/storage_backend.c
View File

@ -1987,33 +1987,31 @@ virStorageBackendVolZeroSparseFileLocal(virStorageVolDefPtr vol,
static int static int
virStorageBackendWipeExtentLocal(virStorageVolDefPtr vol, virStorageBackendWipeLocal(virStorageVolDefPtr vol,
int fd, int fd,
off_t extent_start, unsigned long long wipe_len,
off_t extent_length, size_t writebuf_length,
size_t writebuf_length, size_t *bytes_wiped)
size_t *bytes_wiped)
{ {
int ret = -1, written = 0; int ret = -1, written = 0;
off_t remaining = 0; unsigned long long remaining = 0;
size_t write_size = 0; size_t write_size = 0;
char *writebuf = NULL; char *writebuf = NULL;
VIR_DEBUG("extent logical start: %ju len: %ju", VIR_DEBUG("wiping start: 0 len: %llu", wipe_len);
(uintmax_t)extent_start, (uintmax_t)extent_length);
if (VIR_ALLOC_N(writebuf, writebuf_length) < 0) if (VIR_ALLOC_N(writebuf, writebuf_length) < 0)
goto cleanup; goto cleanup;
if (lseek(fd, extent_start, SEEK_SET) < 0) { if (lseek(fd, 0, SEEK_SET) < 0) {
virReportSystemError(errno, virReportSystemError(errno,
_("Failed to seek to position %ju in volume " _("Failed to seek to the start in volume "
"with path '%s'"), "with path '%s'"),
(uintmax_t)extent_start, vol->target.path); vol->target.path);
goto cleanup; goto cleanup;
} }
remaining = extent_length; remaining = wipe_len;
while (remaining > 0) { while (remaining > 0) {
write_size = (writebuf_length < remaining) ? writebuf_length : remaining; write_size = (writebuf_length < remaining) ? writebuf_length : remaining;
@ -2126,12 +2124,11 @@ virStorageBackendVolWipeLocal(virConnectPtr conn ATTRIBUTE_UNUSED,
if (S_ISREG(st.st_mode) && st.st_blocks < (st.st_size / DEV_BSIZE)) { if (S_ISREG(st.st_mode) && st.st_blocks < (st.st_size / DEV_BSIZE)) {
ret = virStorageBackendVolZeroSparseFileLocal(vol, st.st_size, fd); ret = virStorageBackendVolZeroSparseFileLocal(vol, st.st_size, fd);
} else { } else {
ret = virStorageBackendWipeExtentLocal(vol, ret = virStorageBackendWipeLocal(vol,
fd, fd,
0, vol->target.allocation,
vol->target.allocation, st.st_blksize,
st.st_blksize, &bytes_wiped);
&bytes_wiped);
} }
} }