From c1960debf5c8696f365cd670dedeea01d2a3b9a8 Mon Sep 17 00:00:00 2001 From: "cy.l@inwinstack.com" Date: Sat, 30 Apr 2016 15:22:29 +0800 Subject: [PATCH] rbd-nbd: Fix aio_callback error handling Change aio_callback return code handling for NBD_CMD_READ command. Tracker: http://tracker.ceph.com/issues/15604 Signed-off-by: Chang-Yi Lee (cherry picked from commit ee211295441b126a995c07820176cfc966ab61c5) --- src/tools/rbd_nbd/rbd-nbd.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/tools/rbd_nbd/rbd-nbd.cc b/src/tools/rbd_nbd/rbd-nbd.cc index 60192b07eaf..f7e75317558 100644 --- a/src/tools/rbd_nbd/rbd-nbd.cc +++ b/src/tools/rbd_nbd/rbd-nbd.cc @@ -189,9 +189,10 @@ private: } else if ((ctx->command == NBD_CMD_READ) && ret < static_cast(ctx->request.len)) { int pad_byte_count = static_cast (ctx->request.len) - ret; - ctx->data.append('\x0', pad_byte_count); + ctx->data.append_zero(pad_byte_count); dout(20) << __func__ << ": " << *ctx << ": Pad byte count: " << pad_byte_count << dendl; + ctx->reply.error = 0; } else { ctx->reply.error = htonl(0); } -- 2.47.3