lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dm: convert to idr_alloc()

Browse Source 
Convert to the much saner new idr interface.

Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Alasdair Kergon <agk@redhat.com>
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:04:26 -08:00
committed by Linus Torvalds
parent 80f22b4430
commit c9d76be696
1 changed files with 15 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
drivers/md/dm.c
View File

@@ -1755,62 +1755,38 @@ static void free_minor(int minor)
*/ */
static int specific_minor(int minor) static int specific_minor(int minor)
{ {
int r, m; int r;
if (minor >= (1 << MINORBITS)) if (minor >= (1 << MINORBITS))
return -EINVAL; return -EINVAL;
r = idr_pre_get(&_minor_idr, GFP_KERNEL); idr_preload(GFP_KERNEL);
if (!r)
return -ENOMEM;
spin_lock(&_minor_lock); spin_lock(&_minor_lock);
if (idr_find(&_minor_idr, minor)) { r = idr_alloc(&_minor_idr, MINOR_ALLOCED, minor, minor + 1, GFP_NOWAIT);
r = -EBUSY;
goto out;
}
r = idr_get_new_above(&_minor_idr, MINOR_ALLOCED, minor, &m);
if (r)
goto out;
if (m != minor) {
idr_remove(&_minor_idr, m);
r = -EBUSY;
goto out;
}
out:
spin_unlock(&_minor_lock); spin_unlock(&_minor_lock);
return r; idr_preload_end();
if (r < 0)
return r == -ENOSPC ? -EBUSY : r;
return 0;
} }
static int next_free_minor(int *minor) static int next_free_minor(int *minor)
{ {
int r, m; int r;
r = idr_pre_get(&_minor_idr, GFP_KERNEL);
if (!r)
return -ENOMEM;
idr_preload(GFP_KERNEL);
spin_lock(&_minor_lock); spin_lock(&_minor_lock);
r = idr_get_new(&_minor_idr, MINOR_ALLOCED, &m); r = idr_alloc(&_minor_idr, MINOR_ALLOCED, 0, 1 << MINORBITS, GFP_NOWAIT);
if (r)
goto out;
if (m >= (1 << MINORBITS)) {
idr_remove(&_minor_idr, m);
r = -ENOSPC;
goto out;
}
*minor = m;
out:
spin_unlock(&_minor_lock); spin_unlock(&_minor_lock);
return r; idr_preload_end();
if (r < 0)
return r;
*minor = r;
return 0;
} }
static const struct block_device_operations dm_blk_dops; static const struct block_device_operations dm_blk_dops;