diff options
| author | Alasdair G Kergon <agk@redhat.com> | 2006-03-27 13:17:53 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-27 20:44:59 +0400 |
| commit | 9ade92a9a5b0a3a10efa6551b8c67a9277bf0438 (patch) | |
| tree | 976b3d4f8a90d08cf9db1f7afb40423570360d85 | |
| parent | 7e51f257e87297a5b6fe6d136a8ef67206aaf3a8 (diff) | |
| download | linux-9ade92a9a5b0a3a10efa6551b8c67a9277bf0438.tar.xz | |
[PATCH] dm: tidy mdptr
Change dm_get_mdptr() to take a struct mapped_device instead of dev_t.
Signed-off-by: Alasdair G Kergon <agk@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | drivers/md/dm-ioctl.c | 16 | ||||
| -rw-r--r-- | drivers/md/dm.c | 10 | ||||
| -rw-r--r-- | drivers/md/dm.h | 2 |
3 files changed, 16 insertions, 12 deletions
diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c index 442e2be6052e..0693b6f54b7d 100644 --- a/drivers/md/dm-ioctl.c +++ b/drivers/md/dm-ioctl.c @@ -600,12 +600,22 @@ static int dev_create(struct dm_ioctl *param, size_t param_size) */ static struct hash_cell *__find_device_hash_cell(struct dm_ioctl *param) { + struct mapped_device *md; + void *mdptr = NULL; + if (*param->uuid) return __get_uuid_cell(param->uuid); - else if (*param->name) + + if (*param->name) return __get_name_cell(param->name); - else - return dm_get_mdptr(huge_decode_dev(param->dev)); + + md = dm_get_md(huge_decode_dev(param->dev)); + if (md) { + mdptr = dm_get_mdptr(md); + dm_put(md); + } + + return mdptr; } static struct mapped_device *find_device(struct dm_ioctl *param) diff --git a/drivers/md/dm.c b/drivers/md/dm.c index f140d499602a..3d121cbc2fde 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c @@ -990,15 +990,9 @@ struct mapped_device *dm_get_md(dev_t dev) return md; } -void *dm_get_mdptr(dev_t dev) +void *dm_get_mdptr(struct mapped_device *md) { - struct mapped_device *md; - void *mdptr = NULL; - - md = dm_find_md(dev); - if (md) - mdptr = md->interface_ptr; - return mdptr; + return md->interface_ptr; } void dm_set_mdptr(struct mapped_device *md, void *ptr) diff --git a/drivers/md/dm.h b/drivers/md/dm.h index 0ff11d6f8158..17ffa8d671a7 100644 --- a/drivers/md/dm.h +++ b/drivers/md/dm.h @@ -47,7 +47,7 @@ struct mapped_device; int dm_create(struct mapped_device **md); int dm_create_with_minor(unsigned int minor, struct mapped_device **md); void dm_set_mdptr(struct mapped_device *md, void *ptr); -void *dm_get_mdptr(dev_t dev); +void *dm_get_mdptr(struct mapped_device *md); struct mapped_device *dm_get_md(dev_t dev); /* |