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

dm ioctl: introduce __get_dev_cell

Browse Source 
Move logic to find device based on major/minor number to a separate
function __get_dev_cell (similar to __get_uuid_cell and __get_name_cell).
This makes the function __find_device_hash_cell more straightforward.

Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>
This commit is contained in:
Mikulas Patocka
2011-08-02 12:32:06 +01:00
committed by Alasdair G Kergon
parent 0ddf9644cc
commit ba2e19b0f4
1 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
drivers/md/dm-ioctl.c
View File

@@ -128,6 +128,24 @@ static struct hash_cell *__get_uuid_cell(const char *str)
return NULL; return NULL;
} }
static struct hash_cell *__get_dev_cell(uint64_t dev)
{
struct mapped_device *md;
struct hash_cell *hc;
md = dm_get_md(huge_decode_dev(dev));
if (!md)
return NULL;
hc = dm_get_mdptr(md);
if (!hc) {
dm_put(md);
return NULL;
}
return hc;
}
/*----------------------------------------------------------------- /*-----------------------------------------------------------------
* Inserting, removing and renaming a device. * Inserting, removing and renaming a device.
*---------------------------------------------------------------*/ *---------------------------------------------------------------*/
@@ -718,34 +736,23 @@ static int dev_create(struct dm_ioctl *param, size_t param_size)
*/ */
static struct hash_cell *__find_device_hash_cell(struct dm_ioctl *param) static struct hash_cell *__find_device_hash_cell(struct dm_ioctl *param)
{ {
struct mapped_device *md;
struct hash_cell *hc = NULL; struct hash_cell *hc = NULL;
if (*param->uuid) { if (*param->uuid) {
hc = __get_uuid_cell(param->uuid); hc = __get_uuid_cell(param->uuid);
if (!hc) if (!hc)
return NULL; return NULL;
goto fill_params; } else if (*param->name) {
}
if (*param->name) {
hc = __get_name_cell(param->name); hc = __get_name_cell(param->name);
if (!hc) if (!hc)
return NULL; return NULL;
goto fill_params; } else if (param->dev) {
} hc = __get_dev_cell(param->dev);
if (!hc)
md = dm_get_md(huge_decode_dev(param->dev)); return NULL;
if (!md) } else
return NULL; return NULL;
hc = dm_get_mdptr(md);
if (!hc) {
dm_put(md);
return NULL;
}
fill_params:
/* /*
* Sneakily write in both the name and the uuid * Sneakily write in both the name and the uuid
* while we have the cell. * while we have the cell.