evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nbd: Return error pointer directly

Browse source 
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Jens Axboe <axboe@fb.com>
This commit is contained in:
Markus Pargmann 2015-04-02 10:11:41 +02:00 • committed by Jens Axboe
parent dab5313aa4
commit de9ad6d4ed
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/block/nbd.c
View file

@ -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); err = wait_event_interruptible(nbd->active_wq, nbd->active_req != xreq);
if (unlikely(err)) if (unlikely(err))
goto out; return ERR_PTR(err);
spin_lock(&nbd->queue_lock); spin_lock(&nbd->queue_lock);
list_for_each_entry_safe(req, tmp, &nbd->queue_head, queuelist) { 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); spin_unlock(&nbd->queue_lock);
err = -ENOENT; return ERR_PTR(-ENOENT);
out:
return ERR_PTR(err);
} }
static inline int sock_recv_bvec(struct nbd_device *nbd, struct bio_vec *bvec) static inline int sock_recv_bvec(struct nbd_device *nbd, struct bio_vec *bvec)