[lvm-devel] stable-2.02 - [bcache] reverse earlier patch.
Joe Thornber
thornber at sourceware.org
Thu Jan 16 15:34:56 UTC 2020
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=1e2e12f19c584c3568c255c5d89ed8aadbe61b9c
Commit: 1e2e12f19c584c3568c255c5d89ed8aadbe61b9c
Parent: 6370c20d392fb6228273695cd9f1a2ae43ff1e77
Author: Joe Thornber <ejt at redhat.com>
AuthorDate: Tue Oct 29 15:14:07 2019 +0000
Committer: Joe Thornber <ejt at redhat.com>
CommitterDate: Thu Jan 16 14:58:43 2020 +0000
[bcache] reverse earlier patch.
It broke some unit tests, for v. little benefit
---
lib/device/bcache.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/lib/device/bcache.c b/lib/device/bcache.c
index 56e3db33f..72cc59929 100644
--- a/lib/device/bcache.c
+++ b/lib/device/bcache.c
@@ -246,10 +246,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;
}
@@ -788,7 +784,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;
}
}
More information about the lvm-devel
mailing list