Messages in this thread Patch in this message | | | Date | Thu, 25 May 2006 20:13:57 +0100 | From | Alasdair G Kergon <> | Subject | [PATCH 4/10] dm: move idr_pre_get |
| |
From: Jeff Mahoney <jeffm@suse.com>
idr_pre_get() can sleep while allocating memory.
The next patch will change _minor_lock into a spinlock, so this patch moves idr_pre_get() outside the lock in preparation.
Signed-off-by: Jeff Mahoney <jeffm@suse.com> Signed-Off-By: Alasdair G Kergon <agk@redhat.com>
Index: linux-2.6.17-rc4/drivers/md/dm.c =================================================================== --- linux-2.6.17-rc4.orig/drivers/md/dm.c 2006-05-23 18:16:42.000000000 +0100 +++ linux-2.6.17-rc4/drivers/md/dm.c 2006-05-23 18:16:44.000000000 +0100 @@ -766,6 +766,10 @@ static int specific_minor(struct mapped_ if (minor >= (1 << MINORBITS)) return -EINVAL; + r = idr_pre_get(&_minor_idr, GFP_KERNEL); + if (!r) + return -ENOMEM; + mutex_lock(&_minor_lock); if (idr_find(&_minor_idr, minor)) { @@ -773,16 +777,9 @@ static int specific_minor(struct mapped_ goto out; } - r = idr_pre_get(&_minor_idr, GFP_KERNEL); - if (!r) { - r = -ENOMEM; - goto out; - } - r = idr_get_new_above(&_minor_idr, MINOR_ALLOCED, minor, &m); - if (r) { + if (r) goto out; - } if (m != minor) { idr_remove(&_minor_idr, m); @@ -800,13 +797,11 @@ static int next_free_minor(struct mapped int r; unsigned int m; - mutex_lock(&_minor_lock); - r = idr_pre_get(&_minor_idr, GFP_KERNEL); - if (!r) { - r = -ENOMEM; - goto out; - } + if (!r) + return -ENOMEM; + + mutex_lock(&_minor_lock); r = idr_get_new(&_minor_idr, MINOR_ALLOCED, &m); if (r) { - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |