Abstract dm_find_md() from dm_get_mdptr() for use elsewhere. From: David Teigland Signed-Off-By: Alasdair G Kergon [Submitted upstream 2005/11/18] Index: linux-2.6.14-rc2/drivers/md/dm.c =================================================================== --- linux-2.6.14-rc2.orig/drivers/md/dm.c 2005-09-20 04:00:41.000000000 +0100 +++ linux-2.6.14-rc2/drivers/md/dm.c 2005-10-04 19:32:00.000000000 +0100 @@ -902,10 +902,9 @@ return create_aux(minor, 1, result); } -void *dm_get_mdptr(dev_t dev) +static struct mapped_device *dm_find_md(dev_t dev) { struct mapped_device *md; - void *mdptr = NULL; unsigned minor = MINOR(dev); if (MAJOR(dev) != _major || minor >= (1 << MINORBITS)) @@ -914,12 +913,22 @@ down(&_minor_lock); md = idr_find(&_minor_idr, minor); - - if (md && (dm_disk(md)->first_minor == minor)) - mdptr = md->interface_ptr; + if (!md || (dm_disk(md)->first_minor != minor)) + md = NULL; up(&_minor_lock); + return md; +} + +void *dm_get_mdptr(dev_t dev) +{ + struct mapped_device *md; + void *mdptr = NULL; + + md = dm_find_md(dev); + if (md) + mdptr = md->interface_ptr; return mdptr; }