[Nbd] [PATCH v2 8/9] nbd: Return error code directly
- To: nbd-general@lists.sourceforge.net
- Cc: Joe Perches <joe@...1529...>, Wouter Verhelst <w@...112...>, linux-kernel@...25...
- Subject: [Nbd] [PATCH v2 8/9] nbd: Return error code directly
- From: Markus Pargmann <mpa@...1897...>
- Date: Thu, 12 Mar 2015 14:36:06 +0100
- Message-id: <1426167367-32214-9-git-send-email-mpa@...1897...>
- In-reply-to: <1426167367-32214-1-git-send-email-mpa@...1897...>
- References: <1426167367-32214-1-git-send-email-mpa@...1897...>
By returning the error code directly, we can avoid the jump label
error_out.
Signed-off-by: Markus Pargmann <mpa@...1897...>
---
drivers/block/nbd.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 6e7a7b06efcb..e41fb4ccf39a 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -249,7 +249,7 @@ static int nbd_send_req(struct nbd_device *nbd, struct request *req)
if (result <= 0) {
dev_err(disk_to_dev(nbd->disk),
"Send control failed (result %d)\n", result);
- goto error_out;
+ return -EIO;
}
if (nbd_cmd(req) == NBD_CMD_WRITE) {
@@ -270,14 +270,11 @@ static int nbd_send_req(struct nbd_device *nbd, struct request *req)
dev_err(disk_to_dev(nbd->disk),
"Send data failed (result %d)\n",
result);
- goto error_out;
+ return -EIO;
}
}
}
return 0;
-
-error_out:
- return -EIO;
}
static struct request *nbd_find_request(struct nbd_device *nbd,
--
2.1.4
Reply to: