Messages in this thread Patch in this message | | | From | Markus Pargmann <> | Subject | [PATCH v2 9/9] nbd: Return error pointer directly | Date | Thu, 12 Mar 2015 14:36:07 +0100 |
| |
Signed-off-by: Markus Pargmann <mpa@pengutronix.de> ---
Notes: Changes in v2: - Remove unnecessary brackets
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 e41fb4ccf39a..bd8f4caf53bd 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c @@ -285,7 +285,7 @@ static struct request *nbd_find_request(struct nbd_device *nbd, err = wait_event_interruptible(nbd->active_wq, nbd->active_req != xreq); if (unlikely(err)) - goto out; + return ERR_PTR(err); spin_lock(&nbd->queue_lock); list_for_each_entry_safe(req, tmp, &nbd->queue_head, queuelist) { @@ -297,10 +297,7 @@ static struct request *nbd_find_request(struct nbd_device *nbd, } spin_unlock(&nbd->queue_lock); - err = -ENOENT; - -out: - return ERR_PTR(err); + return ERR_PTR(-ENOENT); } static inline int sock_recv_bvec(struct nbd_device *nbd, struct bio_vec *bvec) -- 2.1.4
| |