The patch titled
dm: change minor_lock to spinlock
has been removed from the -mm tree. Its filename is
dm-change-minor_lock-to-spinlock.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: dm: change minor_lock to spinlock
From: Jeff Mahoney <jeffm@xxxxxxxx>
While removing a device, another another thread might attempt to resurrect it.
This patch replaces the _minor_lock mutex with a spinlock and uses
atomic_dec_and_lock() to serialize reference counting in dm_put().
[akpm: too late for 2.6.17 - suitable for 2.6.17.x after it has settled]
Signed-off-by: Jeff Mahoney <jeffm@xxxxxxxx>
Signed-off-by: Alasdair G Kergon <agk@xxxxxxxxxx>
Cc: <stable@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/md/dm.c | 27 +++++++++++++--------------
1 file changed, 13 insertions(+), 14 deletions(-)
diff -puN drivers/md/dm.c~dm-change-minor_lock-to-spinlock drivers/md/dm.c
--- a/drivers/md/dm.c~dm-change-minor_lock-to-spinlock
+++ a/drivers/md/dm.c
@@ -26,6 +26,7 @@ static const char *_name = DM_NAME;
static unsigned int major = 0;
static unsigned int _major = 0;
+static DEFINE_SPINLOCK(_minor_lock);
/*
* One of these is allocated per bio.
*/
@@ -746,14 +747,13 @@ static int dm_any_congested(void *conges
/*-----------------------------------------------------------------
* An IDR is used to keep track of allocated minor numbers.
*---------------------------------------------------------------*/
-static DEFINE_MUTEX(_minor_lock);
static DEFINE_IDR(_minor_idr);
static void free_minor(unsigned int minor)
{
- mutex_lock(&_minor_lock);
+ spin_lock(&_minor_lock);
idr_remove(&_minor_idr, minor);
- mutex_unlock(&_minor_lock);
+ spin_unlock(&_minor_lock);
}
/*
@@ -770,7 +770,7 @@ static int specific_minor(struct mapped_
if (!r)
return -ENOMEM;
- mutex_lock(&_minor_lock);
+ spin_lock(&_minor_lock);
if (idr_find(&_minor_idr, minor)) {
r = -EBUSY;
@@ -788,7 +788,7 @@ static int specific_minor(struct mapped_
}
out:
- mutex_unlock(&_minor_lock);
+ spin_unlock(&_minor_lock);
return r;
}
@@ -801,7 +801,7 @@ static int next_free_minor(struct mapped
if (!r)
return -ENOMEM;
- mutex_lock(&_minor_lock);
+ spin_lock(&_minor_lock);
r = idr_get_new(&_minor_idr, MINOR_ALLOCED, &m);
if (r) {
@@ -817,7 +817,7 @@ static int next_free_minor(struct mapped
*minor = m;
out:
- mutex_unlock(&_minor_lock);
+ spin_unlock(&_minor_lock);
return r;
}
@@ -887,9 +887,9 @@ static struct mapped_device *alloc_dev(u
init_waitqueue_head(&md->eventq);
/* Populate the mapping, nobody knows we exist yet */
- mutex_lock(&_minor_lock);
+ spin_lock(&_minor_lock);
old_md = idr_replace(&_minor_idr, md, minor);
- mutex_unlock(&_minor_lock);
+ spin_unlock(&_minor_lock);
BUG_ON(old_md != MINOR_ALLOCED);
@@ -1020,13 +1020,13 @@ static struct mapped_device *dm_find_md(
if (MAJOR(dev) != _major || minor >= (1 << MINORBITS))
return NULL;
- mutex_lock(&_minor_lock);
+ spin_lock(&_minor_lock);
md = idr_find(&_minor_idr, minor);
if (md && (md == MINOR_ALLOCED || (dm_disk(md)->first_minor != minor)))
md = NULL;
- mutex_unlock(&_minor_lock);
+ spin_unlock(&_minor_lock);
return md;
}
@@ -1060,11 +1060,10 @@ void dm_put(struct mapped_device *md)
{
struct dm_table *map;
- if (atomic_dec_and_test(&md->holders)) {
+ if (atomic_dec_and_lock(&md->holders, &_minor_lock)) {
map = dm_get_table(md);
- mutex_lock(&_minor_lock);
idr_replace(&_minor_idr, MINOR_ALLOCED, dm_disk(md)->first_minor);
- mutex_unlock(&_minor_lock);
+ spin_unlock(&_minor_lock);
if (!dm_suspended(md)) {
dm_table_presuspend_targets(map);
dm_table_postsuspend_targets(map);
_
Patches currently in -mm which might be from jeffm@xxxxxxxx are
origin.patch
reiserfs-fix-is_reusable-bitmap-check-to-not-traverse-the-bitmap-info-array.patch
reiserfs-clean-up-bitmap-block-buffer-head-references.patch
reiserfs-reorganize-bitmap-loading-functions.patch
reiserfs-reorganize-bitmap-loading-functions-fix.patch
reiserfs-reorganize-bitmap-loading-functions-fix2.patch
reiserfs-on-demand-bitmap-loading.patch
reiserfs-on-demand-bitmap-loading-fix.patch
reiserfs-use-generic_file_open-for-open-checks.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
