[PATCH 4/6] nbd: return the allocated nbd_device from nbd_dev_add
Return the device we just allocated instead of doing an extra search for
it in the caller.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
drivers/block/nbd.c | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index de8b23af2486..08161c73c9ed 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -1681,7 +1681,7 @@ static const struct blk_mq_ops nbd_mq_ops = {
.timeout = nbd_xmit_timeout,
};
-static int nbd_dev_add(int index)
+static struct nbd_device *nbd_dev_add(int index)
{
struct nbd_device *nbd;
struct gendisk *disk;
@@ -1753,7 +1753,7 @@ static int nbd_dev_add(int index)
sprintf(disk->disk_name, "nbd%d", index);
add_disk(disk);
nbd_total_devices++;
- return index;
+ return nbd;
out_free_idr:
idr_remove(&nbd_index_idr, index);
@@ -1762,7 +1762,7 @@ static int nbd_dev_add(int index)
out_free_nbd:
kfree(nbd);
out:
- return err;
+ return ERR_PTR(err);
}
static int find_free_cb(int id, void *ptr, void *data)
@@ -1848,25 +1848,22 @@ static int nbd_genl_connect(struct sk_buff *skb, struct genl_info *info)
if (index == -1) {
ret = idr_for_each(&nbd_index_idr, &find_free_cb, &nbd);
if (ret == 0) {
- int new_index;
- new_index = nbd_dev_add(-1);
- if (new_index < 0) {
+ nbd = nbd_dev_add(-1);
+ if (IS_ERR(nbd)) {
mutex_unlock(&nbd_index_mutex);
printk(KERN_ERR "nbd: failed to add new device\n");
- return new_index;
+ return PTR_ERR(nbd);
}
- nbd = idr_find(&nbd_index_idr, new_index);
}
} else {
nbd = idr_find(&nbd_index_idr, index);
if (!nbd) {
- ret = nbd_dev_add(index);
- if (ret < 0) {
+ nbd = nbd_dev_add(index);
+ if (IS_ERR(nbd)) {
mutex_unlock(&nbd_index_mutex);
printk(KERN_ERR "nbd: failed to add new device\n");
- return ret;
+ return PTR_ERR(nbd);
}
- nbd = idr_find(&nbd_index_idr, index);
}
}
if (!nbd) {
--
2.30.2
Reply to: