133 lines
4.7 KiB
Diff
133 lines
4.7 KiB
Diff
From 817bacccc1f44a060a4250ff9e6a27086be09d8b Mon Sep 17 00:00:00 2001
|
|
From: "Richard W.M. Jones" <rjones@redhat.com>
|
|
Date: Wed, 4 Jun 2025 21:15:26 +0100
|
|
Subject: [PATCH] file: Add offset/count to error messages
|
|
|
|
Although the same information is available in debug logs, if verbose
|
|
messages (-v) are not used then the information is lost. As it might
|
|
be useful occasionally, ensure it is captured in errors.
|
|
|
|
(cherry picked from commit 253574354252f4a77e2df0769b721e76f1777651)
|
|
---
|
|
plugins/file/file.c | 35 ++++++++++++++++++++++++-----------
|
|
1 file changed, 24 insertions(+), 11 deletions(-)
|
|
|
|
diff --git a/plugins/file/file.c b/plugins/file/file.c
|
|
index 8018b294..e62e2437 100644
|
|
--- a/plugins/file/file.c
|
|
+++ b/plugins/file/file.c
|
|
@@ -904,7 +904,8 @@ file_pread (void *handle, void *buf, uint32_t count, uint64_t offset,
|
|
while (count > 0) {
|
|
ssize_t r = pread (h->fd, buf, count, offset);
|
|
if (r == -1) {
|
|
- nbdkit_error ("pread: %s: %m", h->name);
|
|
+ nbdkit_error ("pread: %s: offset=%" PRIu64 ", count=%" PRIu32 ": %m",
|
|
+ h->name, offset, count);
|
|
return -1;
|
|
}
|
|
if (r == 0) {
|
|
@@ -940,7 +941,8 @@ file_pwrite (void *handle, const void *buf, uint32_t count, uint64_t offset,
|
|
while (count > 0) {
|
|
ssize_t r = pwrite (h->fd, buf, count, offset);
|
|
if (r == -1) {
|
|
- nbdkit_error ("pwrite: %s: %m", h->name);
|
|
+ nbdkit_error ("pwrite: %s: offset=%" PRIu64 ", count=%" PRIu32 ": %m",
|
|
+ h->name, offset, count);
|
|
return -1;
|
|
}
|
|
buf += r;
|
|
@@ -1022,7 +1024,8 @@ file_zero (void *handle, uint32_t count, uint64_t offset, uint32_t flags)
|
|
}
|
|
|
|
if (!is_enotsup (errno)) {
|
|
- nbdkit_error ("zero: %s: %m", h->name);
|
|
+ nbdkit_error ("zero: %s: offset=%" PRIu64 ", count=%" PRIu32 ": %m",
|
|
+ h->name, offset, count);
|
|
return -1;
|
|
}
|
|
|
|
@@ -1058,7 +1061,8 @@ file_zero (void *handle, uint32_t count, uint64_t offset, uint32_t flags)
|
|
}
|
|
|
|
if (!is_enotsup (errno)) {
|
|
- nbdkit_error ("zero: %s: %m", h->name);
|
|
+ nbdkit_error ("zero: %s: offset=%" PRIu64 ", count=%" PRIu32 ": %m",
|
|
+ h->name, offset, count);
|
|
return -1;
|
|
}
|
|
|
|
@@ -1066,7 +1070,8 @@ file_zero (void *handle, uint32_t count, uint64_t offset, uint32_t flags)
|
|
}
|
|
else {
|
|
if (!is_enotsup (errno)) {
|
|
- nbdkit_error ("zero: %s: %m", h->name);
|
|
+ nbdkit_error ("zero: %s: offset=%" PRIu64 ", count=%" PRIu32 ": %m",
|
|
+ h->name, offset, count);
|
|
return -1;
|
|
}
|
|
|
|
@@ -1088,7 +1093,8 @@ file_zero (void *handle, uint32_t count, uint64_t offset, uint32_t flags)
|
|
}
|
|
|
|
if (!is_enotsup (errno)) {
|
|
- nbdkit_error ("zero: %s: %m", h->name);
|
|
+ nbdkit_error ("zero: %s: offset=%" PRIu64 ", count=%" PRIu32 ": %m",
|
|
+ h->name, offset, count);
|
|
return -1;
|
|
}
|
|
|
|
@@ -1116,14 +1122,16 @@ file_zero (void *handle, uint32_t count, uint64_t offset, uint32_t flags)
|
|
}
|
|
|
|
if (!is_enotsup (errno)) {
|
|
- nbdkit_error ("zero: %s: %m", h->name);
|
|
+ nbdkit_error ("zero: %s: offset=%" PRIu64 ", count=%" PRIu32 ": %m",
|
|
+ h->name, offset, count);
|
|
return -1;
|
|
}
|
|
|
|
h->can_fallocate = false;
|
|
} else {
|
|
if (!is_enotsup (errno)) {
|
|
- nbdkit_error ("zero: %s: %m", h->name);
|
|
+ nbdkit_error ("zero: %s: offset=%" PRIu64 ", count=%" PRIu32 ":%m",
|
|
+ h->name, offset, count);
|
|
return -1;
|
|
}
|
|
|
|
@@ -1147,7 +1155,8 @@ file_zero (void *handle, uint32_t count, uint64_t offset, uint32_t flags)
|
|
}
|
|
|
|
if (errno != ENOTTY) {
|
|
- nbdkit_error ("zero: %s: %m", h->name);
|
|
+ nbdkit_error ("zero: %s: offset=%" PRIu64 ", count=%" PRIu32 ": %m",
|
|
+ h->name, offset, count);
|
|
return -1;
|
|
}
|
|
|
|
@@ -1185,7 +1194,9 @@ file_trim (void *handle, uint32_t count, uint64_t offset, uint32_t flags)
|
|
/* Trim is advisory; we don't care if it fails for anything other
|
|
* than EIO or EPERM. */
|
|
if (errno == EPERM || errno == EIO) {
|
|
- nbdkit_error ("fallocate: %s: %m", h->name);
|
|
+ nbdkit_error ("fallocate: %s: offset=%" PRIu64 ", count=%" PRIu32 ":"
|
|
+ " %m",
|
|
+ h->name, offset, count);
|
|
return -1;
|
|
}
|
|
|
|
@@ -1306,7 +1317,9 @@ file_cache (void *handle, uint32_t count, uint64_t offset, uint32_t flags)
|
|
r = posix_fadvise (h->fd, offset, count, POSIX_FADV_WILLNEED);
|
|
if (r) {
|
|
errno = r;
|
|
- nbdkit_error ("posix_fadvise: %s: %m", h->name);
|
|
+ nbdkit_error ("posix_fadvise: %s: offset=%" PRIu64 ", count=%" PRIu32 ":"
|
|
+ " %m",
|
|
+ h->name, offset, count);
|
|
return -1;
|
|
}
|
|
return 0;
|
|
--
|
|
2.47.1
|
|
|