summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Thornber <ejt@redhat.com>2019-10-29 15:14:07 +0000
committerJoe Thornber <ejt@redhat.com>2019-10-29 15:14:07 +0000
commit7e8296f4788d6a83863a268582280587ade2e26c (patch)
tree886bdc0a465cd6f9007ba75d21a4acdf2c80f57c
parent2b3c39e402b966043a65ae649797defb6db597fc (diff)
downloadlvm2-7e8296f4788d6a83863a268582280587ade2e26c.tar.gz
[bcache] reverse earlier patch.
It broke some unit tests, for v. little benefit
-rw-r--r--lib/device/bcache.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/lib/device/bcache.c b/lib/device/bcache.c
index 1249d6ef7..b0edf2806 100644
--- a/lib/device/bcache.c
+++ b/lib/device/bcache.c
@@ -293,10 +293,6 @@ static bool _async_issue(struct io_engine *ioe, enum dir d, int fd,
if (r < 0) {
_cb_free(e->cbs, cb);
- ((struct block *) context)->error = r;
- log_warn("io_submit <%c> off %llu bytes %llu return %d:%s",
- (d == DIR_READ) ? 'R' : 'W', (long long unsigned)offset,
- (long long unsigned) nbytes, r, strerror(-r));
return false;
}
@@ -873,7 +869,8 @@ static void _issue_low_level(struct block *b, enum dir d)
dm_list_move(&cache->io_pending, &b->list);
if (!cache->engine->issue(cache->engine, d, b->fd, sb, se, b->data, b)) {
- _complete_io(b, b->error);
+ /* FIXME: if io_submit() set an errno, return that instead of EIO? */
+ _complete_io(b, -EIO);
return;
}
}