loop: move loop_ctl_mutex locking into loop_add

Move acquiring and releasing loop_ctl_mutex from the callers into
loop_add.

Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 57f6930246ce884e781565a6ff3333a0cee53119..a5ba8dbf99284c974a0b73c110890b82e46d6bab 100644 (file)
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -2078,9 +2078,12 @@ static int loop_add(int i)
        lo = kzalloc(sizeof(*lo), GFP_KERNEL);
        if (!lo)
                goto out;
-
        lo->lo_state = Lo_unbound;
 
+       err = mutex_lock_killable(&loop_ctl_mutex);
+       if (err)
+               goto out_free_dev;
+
        /* allocate id, if @id >= 0, we're requesting that specific id */
        if (i >= 0) {
                err = idr_alloc(&loop_index_idr, lo, i, i + 1, GFP_KERNEL);
@@ -2090,7 +2093,7 @@ static int loop_add(int i)
                err = idr_alloc(&loop_index_idr, lo, 0, 0, GFP_KERNEL);
        }
        if (err < 0)
-               goto out_free_dev;
+               goto out_unlock;
        i = err;
 
        err = -ENOMEM;
@@ -2160,6 +2163,7 @@ static int loop_add(int i)
        disk->queue             = lo->lo_queue;
        sprintf(disk->disk_name, "loop%d", i);
        add_disk(disk);
+       mutex_unlock(&loop_ctl_mutex);
        return lo->lo_number;
 
 out_free_queue:
@@ -2168,6 +2172,8 @@ out_cleanup_tags:
        blk_mq_free_tag_set(&lo->tag_set);
 out_free_idr:
        idr_remove(&loop_index_idr, i);
+out_unlock:
+       mutex_unlock(&loop_ctl_mutex);
 out_free_dev:
        kfree(lo);
 out:
@@ -2228,22 +2234,7 @@ static void loop_probe(dev_t dev)
 
        if (max_loop && idx >= max_loop)
                return;
-
-       mutex_lock(&loop_ctl_mutex);
        loop_add(idx);
-       mutex_unlock(&loop_ctl_mutex);
-}
-
-static int loop_control_add(int idx)
-{
-       int ret;
-               
-       ret = mutex_lock_killable(&loop_ctl_mutex);
-       if (ret)
-               return ret;
-       ret = loop_add(idx);
-       mutex_unlock(&loop_ctl_mutex);
-       return ret;
 }
 
 static int loop_control_remove(int idx)
@@ -2287,11 +2278,11 @@ static int loop_control_get_free(int idx)
        if (ret)
                return ret;
        ret = loop_lookup(&lo, -1);
-       if (ret < 0)
-               ret = loop_add(-1);
        mutex_unlock(&loop_ctl_mutex);
 
-       return ret;
+       if (ret >= 0)
+               return ret;
+       return loop_add(-1);
 }
 
 static long loop_control_ioctl(struct file *file, unsigned int cmd,
@@ -2299,7 +2290,7 @@ static long loop_control_ioctl(struct file *file, unsigned int cmd,
 {
        switch (cmd) {
        case LOOP_CTL_ADD:
-               return loop_control_add(parm);
+               return loop_add(parm);
        case LOOP_CTL_REMOVE:
                return loop_control_remove(parm);
        case LOOP_CTL_GET_FREE:
@@ -2380,10 +2371,8 @@ static int __init loop_init(void)
        }
 
        /* pre-create number of devices given by config or max_loop */
-       mutex_lock(&loop_ctl_mutex);
        for (i = 0; i < nr; i++)
                loop_add(i);
-       mutex_unlock(&loop_ctl_mutex);
 
        printk(KERN_INFO "loop: module loaded\n");
        return 0;