kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

block/loop: convert to idr_alloc()

Browse source 
Convert to the much saner new idr interface.

Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Tejun Heo 2013-02-27 17:03:58 -08:00 committed by Linus Torvalds
parent bab998d62f
commit c718aa652d
1 changed files with 5 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
drivers/block/loop.c
View file

@ -1624,30 +1624,17 @@ static int loop_add(struct loop_device **l, int i)
if (!lo) if (!lo)
goto out; goto out;
if (!idr_pre_get(&loop_index_idr, GFP_KERNEL)) /* allocate id, if @id >= 0, we're requesting that specific id */
goto out_free_dev;
if (i >= 0) { if (i >= 0) {
int m; err = idr_alloc(&loop_index_idr, lo, i, i + 1, GFP_KERNEL);
if (err == -ENOSPC)
/* create specific i in the index */
err = idr_get_new_above(&loop_index_idr, lo, i, &m);
if (err >= 0 && i != m) {
idr_remove(&loop_index_idr, m);
err = -EEXIST; err = -EEXIST;
}
} else if (i == -1) {
int m;
/* get next free nr */
err = idr_get_new(&loop_index_idr, lo, &m);
if (err >= 0)
i = m;
} else { } else {
err = -EINVAL; err = idr_alloc(&loop_index_idr, lo, 0, 0, GFP_KERNEL);
} }
if (err < 0) if (err < 0)
goto out_free_dev; goto out_free_dev;
i = err;
lo->lo_queue = blk_alloc_queue(GFP_KERNEL); lo->lo_queue = blk_alloc_queue(GFP_KERNEL);
if (!lo->lo_queue) if (!lo->lo_queue)