From: Joshua Baergen <jbaergen@digitalocean.com>
Date: Wed, 12 Oct 2022 18:19:36 +0000 (-0600)
Subject: blk/kernel: Fix error code mapping in KernelDevice::read.
X-Git-Tag: v18.1.0~745^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F48467%2Fhead;p=ceph.git

blk/kernel: Fix error code mapping in KernelDevice::read.

pread returns -1 upon error and stores the error code in errno, and thus
the wrong error was being passed into is_expected_ioerr. This is handled
correctly just a few lines down where we return -errno, so it was likely
just an oversight when adapting this logic from the aio codepath, where
the return code is indeed the errno.

This logic has been incorrect since it was introduced in 2018 via
a1e0ece7f987c7a563b25ec0d02fc6f8445ef54e.

Signed-off-by: Joshua Baergen <jbaergen@digitalocean.com>
---

diff --git a/src/blk/kernel/KernelDevice.cc b/src/blk/kernel/KernelDevice.cc
index d9c1e529c07..14b5b415385 100644
--- a/src/blk/kernel/KernelDevice.cc
+++ b/src/blk/kernel/KernelDevice.cc
@@ -1229,7 +1229,7 @@ int KernelDevice::read(uint64_t off, uint64_t len, bufferlist *pbl,
 	 << "s" << dendl;
   }
   if (r < 0) {
-    if (ioc->allow_eio && is_expected_ioerr(r)) {
+    if (ioc->allow_eio && is_expected_ioerr(-errno)) {
       r = -EIO;
     } else {
       r = -errno;