mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Markus Pargmann <mpa@pengutronix.de>
To: nbd-general@lists.sourceforge.net
Cc: linux-kernel@vger.kernel.org, Markus Pargmann <mpa@pengutronix.de>
Subject: [PATCH 8/9] nbd: Return error code directly
Date: Thu, 12 Feb 2015 21:57:36 +0100	[thread overview]
Message-ID: <1423774657-12748-9-git-send-email-mpa@pengutronix.de> (raw)
In-Reply-To: <1423774657-12748-1-git-send-email-mpa@pengutronix.de>

By returning the error code directly, we can avoid the jump label
error_out.

Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
---
 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 3a3e0057e991..f2c1973c486a 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -244,7 +244,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) {
@@ -265,14 +265,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


  parent reply	other threads:[~2015-02-12 20:58 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-02-12 20:57 [PATCH 0/9] nbd: cleanups Markus Pargmann
2015-02-12 20:57 ` [PATCH 1/9] Documentation: nbd: Reformat to allow more documentation Markus Pargmann
2015-02-12 20:57 ` [PATCH 2/9] Documentation: nbd: Add list of module parameters Markus Pargmann
2015-02-14 10:29   ` [Nbd] " Wouter Verhelst
2015-02-15 21:53     ` Markus Pargmann
2015-02-12 20:57 ` [PATCH 3/9] nbd: Remove kernel internal header Markus Pargmann
2015-02-14 10:30   ` [Nbd] " Wouter Verhelst
2015-02-15 21:56     ` Markus Pargmann
2015-02-12 20:57 ` [PATCH 4/9] nbd: Replace kthread_create with kthread_run Markus Pargmann
2015-02-12 20:57 ` [PATCH 5/9] nbd: Fix device bytesize type Markus Pargmann
2015-02-12 20:57 ` [PATCH 6/9] nbd: Restructure debugging prints Markus Pargmann
2015-02-12 21:08   ` Joe Perches
2015-02-13  9:58     ` Markus Pargmann
2015-02-13 10:05       ` Joe Perches
2015-02-13 11:24         ` Markus Pargmann
2015-02-13 11:48           ` Joe Perches
2015-02-15 22:20             ` Markus Pargmann
2015-02-16  0:06               ` Joe Perches
2015-02-12 20:57 ` [PATCH 7/9] nbd: Remove fixme that was already fixed Markus Pargmann
2015-02-12 20:57 ` Markus Pargmann [this message]
2015-02-12 20:57 ` [PATCH 9/9] nbd: Return error pointer directly Markus Pargmann
2015-04-02  8:11 [PULL] NBD patches for 4.1 Markus Pargmann
2015-04-02  8:11 ` [PATCH 8/9] nbd: Return error code directly Markus Pargmann

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1423774657-12748-9-git-send-email-mpa@pengutronix.de \
    --to=mpa@pengutronix.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=nbd-general@lists.sourceforge.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®