diff options
| author | haad <haad@NetBSD.org> | 2010-01-04 00:12:22 +0000 |
|---|---|---|
| committer | haad <haad@NetBSD.org> | 2010-01-04 00:12:22 +0000 |
| commit | 293fc00622d830d19d388458bc8774c17cb97ef9 (patch) | |
| tree | d0a8d7a6e9bdb93138f8759d71a314ca04874b36 /sys/dev/dm/dm_ioctl.c | |
| parent | 1ee1eb05c32ccacc20d4b0b1e218fb18ee8b3f4d (diff) | |
Indent files remove unnecessary blank lines, white spaces and KNFize code.
Diffstat (limited to 'sys/dev/dm/dm_ioctl.c')
| -rw-r--r-- | sys/dev/dm/dm_ioctl.c | 332 |
1 files changed, 158 insertions, 174 deletions
diff --git a/sys/dev/dm/dm_ioctl.c b/sys/dev/dm/dm_ioctl.c index d79a7d83ab4..f053b4a46ef 100644 --- a/sys/dev/dm/dm_ioctl.c +++ b/sys/dev/dm/dm_ioctl.c @@ -1,5 +1,4 @@ - -/* $NetBSD: dm_ioctl.c,v 1.19 2010/01/03 22:22:23 haad Exp $ */ +/* $NetBSD: dm_ioctl.c,v 1.20 2010/01/04 00:19:08 haad Exp $ */ /* * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -45,15 +44,15 @@ * up them. * * table_head locking: - * To access table entries dm_table_* routines must be used. + * To access table entries dm_table_* routines must be used. * * dm_table_get_entry will increment table users reference - * counter. It will return active or inactive table depedns + * counter. It will return active or inactive table depedns * on uint8_t argument. * * dm_table_release must be called for every table_entry from * dm_table_get_entry. Between these to calls tables can'tbe switched - * or destroyed. + * or destroyed. * * dm_table_head_init initialize talbe_entries SLISTS and io_cv. * @@ -64,7 +63,7 @@ * dm_table_size etc. There is another user for table_head which wants * to change table lists e.g. dm_dev_resume_ioctl, dm_dev_remove_ioctl, * dm_table_clear_ioctl. - * + * * NOTE: It is not allowed to call dm_table_destroy, dm_table_switch_tables * with hold table reference counter. Table reference counter is hold * after calling dm_table_get_entry routine. After calling this @@ -94,7 +93,7 @@ #include "netbsd-dm.h" #include "dm.h" -static uint64_t sc_minor_num; +static uint64_t sc_minor_num; extern const struct dkdriver dmdkdriver; uint64_t dev_counter; @@ -105,18 +104,17 @@ static struct cfdata dm_cfdata = { .cf_fstate = FSTATE_STAR, .cf_unit = 0 }; - #define DM_REMOVE_FLAG(flag, name) do { \ prop_dictionary_get_uint32(dm_dict,DM_IOCTL_FLAGS,&flag); \ flag &= ~name; \ prop_dictionary_set_uint32(dm_dict,DM_IOCTL_FLAGS,flag); \ - } while (/*CONSTCOND*/0) +} while (/*CONSTCOND*/0) #define DM_ADD_FLAG(flag, name) do { \ prop_dictionary_get_uint32(dm_dict,DM_IOCTL_FLAGS,&flag); \ flag |= name; \ prop_dictionary_set_uint32(dm_dict,DM_IOCTL_FLAGS,flag); \ - } while (/*CONSTCOND*/0) +} while (/*CONSTCOND*/0) static int dm_dbg_print_flags(int); @@ -126,8 +124,8 @@ static int dm_dbg_print_flags(int); static int dm_dbg_print_flags(int flags) { - aprint_debug("dbg_print --- %d\n",flags); - + aprint_debug("dbg_print --- %d\n", flags); + if (flags & DM_READONLY_FLAG) aprint_debug("dbg_flags: DM_READONLY_FLAG set In/Out\n"); @@ -157,10 +155,9 @@ dm_dbg_print_flags(int flags) if (flags & DM_NOFLUSH_FLAG) aprint_debug("dbg_flags: DM_NOFLUSH_FLAG set In\n"); - + return 0; } - /* * Get version ioctl call I do it as default therefore this * function is unused now. @@ -168,9 +165,9 @@ dm_dbg_print_flags(int flags) int dm_get_version_ioctl(prop_dictionary_t dm_dict) { + return 0; } - /* * Get list of all available targets from global * target list and sent them back to libdevmapper. @@ -184,18 +181,15 @@ dm_list_versions_ioctl(prop_dictionary_t dm_dict) flags = 0; prop_dictionary_get_uint32(dm_dict, DM_IOCTL_FLAGS, &flags); - - dm_dbg_print_flags(flags); + dm_dbg_print_flags(flags); target_list = dm_target_prop_list(); prop_dictionary_set(dm_dict, DM_IOCTL_CMD_DATA, target_list); - prop_object_release(target_list); - + return 0; } - /* * Create in-kernel entry for device. Device attributes such as name, uuid are * taken from proplib dictionary. @@ -208,49 +202,47 @@ dm_dev_create_ioctl(prop_dictionary_t dm_dict) const char *name, *uuid; int r, flags; device_t devt; - + r = 0; flags = 0; - name = NULL; + name = NULL; uuid = NULL; /* Get needed values from dictionary. */ prop_dictionary_get_cstring_nocopy(dm_dict, DM_IOCTL_NAME, &name); prop_dictionary_get_cstring_nocopy(dm_dict, DM_IOCTL_UUID, &uuid); prop_dictionary_get_uint32(dm_dict, DM_IOCTL_FLAGS, &flags); - + dm_dbg_print_flags(flags); /* Lookup name and uuid if device already exist quit. */ if ((dmv = dm_dev_lookup(name, uuid, -1)) != NULL) { - DM_ADD_FLAG(flags, DM_EXISTS_FLAG); /* Device already exists */ + DM_ADD_FLAG(flags, DM_EXISTS_FLAG); /* Device already exists */ dm_dev_unbusy(dmv); return EEXIST; } - if ((devt = config_attach_pseudo(&dm_cfdata)) == NULL) { aprint_error("Unable to attach pseudo device dm/%s\n", name); return (ENOMEM); } - if ((dmv = dm_dev_alloc()) == NULL) return ENOMEM; if (uuid) strncpy(dmv->uuid, uuid, DM_UUID_LEN); - else + else dmv->uuid[0] = '\0'; - + if (name) strlcpy(dmv->name, name, DM_NAME_LEN); dmv->minor = atomic_inc_64_nv(&sc_minor_num); - dmv->flags = 0; /* device flags are set when needed */ + dmv->flags = 0; /* device flags are set when needed */ dmv->ref_cnt = 0; dmv->event_nr = 0; dmv->dev_type = 0; dmv->devt = devt; - + dm_table_head_init(&dmv->table_head); mutex_init(&dmv->dev_mtx, MUTEX_DEFAULT, IPL_NONE); @@ -266,19 +258,18 @@ dm_dev_create_ioctl(prop_dictionary_t dm_dict) disk_attach(dmv->diskp); dmv->diskp->dk_info = NULL; - - if ((r = dm_dev_insert(dmv)) != 0) + + if ((r = dm_dev_insert(dmv)) != 0) dm_dev_free(dmv); - + DM_ADD_FLAG(flags, DM_EXISTS_FLAG); DM_REMOVE_FLAG(flags, DM_INACTIVE_PRESENT_FLAG); /* Increment device counter After creating device */ atomic_inc_64(&dev_counter); - + return r; } - /* * Get list of created device-mapper devices fromglobal list and * send it to kernel. @@ -295,7 +286,7 @@ dm_dev_create_ioctl(prop_dictionary_t dm_dict) * <integer>...</integer> * </dict> * </array> - * + * */ int dm_dev_list_ioctl(prop_dictionary_t dm_dict) @@ -303,21 +294,20 @@ dm_dev_list_ioctl(prop_dictionary_t dm_dict) prop_array_t dev_list; uint32_t flags; - + flags = 0; - + prop_dictionary_get_uint32(dm_dict, DM_IOCTL_FLAGS, &flags); - + dm_dbg_print_flags(flags); - + dev_list = dm_dev_prop_list(); prop_dictionary_set(dm_dict, DM_IOCTL_CMD_DATA, dev_list); prop_object_release(dev_list); - + return 0; } - /* * Rename selected devices old name is in struct dm_ioctl. * newname is taken from dictionary @@ -332,14 +322,14 @@ dm_dev_rename_ioctl(prop_dictionary_t dm_dict) { prop_array_t cmd_array; dm_dev_t *dmv; - + const char *name, *uuid, *n_name; uint32_t flags, minor; name = NULL; uuid = NULL; minor = 0; - + /* Get needed values from dictionary. */ prop_dictionary_get_cstring_nocopy(dm_dict, DM_IOCTL_NAME, &name); prop_dictionary_get_cstring_nocopy(dm_dict, DM_IOCTL_UUID, &uuid); @@ -347,35 +337,34 @@ dm_dev_rename_ioctl(prop_dictionary_t dm_dict) prop_dictionary_get_uint32(dm_dict, DM_IOCTL_MINOR, &minor); dm_dbg_print_flags(flags); - + cmd_array = prop_dictionary_get(dm_dict, DM_IOCTL_CMD_DATA); prop_array_get_cstring_nocopy(cmd_array, 0, &n_name); - + if (strlen(n_name) + 1 > DM_NAME_LEN) return EINVAL; - + if ((dmv = dm_dev_rem(name, uuid, minor)) == NULL) { DM_REMOVE_FLAG(flags, DM_EXISTS_FLAG); return ENOENT; } - /* change device name */ - /* XXX How to deal with this change, name only used in - * dm_dev_routines, should I add dm_dev_change_name which will run under the - * dm_dev_list mutex ? + /* + * XXX How to deal with this change, name only used in + * dm_dev_routines, should I add dm_dev_change_name which will run + * under the dm_dev_list mutex ? */ strlcpy(dmv->name, n_name, DM_NAME_LEN); - + prop_dictionary_set_uint32(dm_dict, DM_IOCTL_OPEN, dmv->table_head.io_cnt); prop_dictionary_set_uint32(dm_dict, DM_IOCTL_MINOR, dmv->minor); prop_dictionary_set_cstring(dm_dict, DM_IOCTL_UUID, dmv->uuid); dm_dev_insert(dmv); - + return 0; } - /* * Remove device from global list I have to remove active * and inactive tables first. @@ -387,34 +376,37 @@ dm_dev_remove_ioctl(prop_dictionary_t dm_dict) const char *name, *uuid; uint32_t flags, minor; device_t devt; - + flags = 0; name = NULL; uuid = NULL; - + /* Get needed values from dictionary. */ prop_dictionary_get_cstring_nocopy(dm_dict, DM_IOCTL_NAME, &name); prop_dictionary_get_cstring_nocopy(dm_dict, DM_IOCTL_UUID, &uuid); prop_dictionary_get_uint32(dm_dict, DM_IOCTL_FLAGS, &flags); prop_dictionary_get_uint32(dm_dict, DM_IOCTL_MINOR, &minor); - + dm_dbg_print_flags(flags); - /* This seems as hack to me, probably use routine dm_dev_get_devt to - atomicaly get devt from device. */ + /* + * This seems as hack to me, probably use routine dm_dev_get_devt to + * atomicaly get devt from device. + */ if ((dmv = dm_dev_lookup(name, uuid, minor)) == NULL) { DM_REMOVE_FLAG(flags, DM_EXISTS_FLAG); return ENOENT; } - devt = dmv->devt; dm_dev_unbusy(dmv); - - /* This will call dm_detach routine which will actually removes device. */ + + /* + * This will call dm_detach routine which will actually removes + * device. + */ return config_detach(devt, DETACH_QUIET); } - /* * Return actual state of device to libdevmapper. */ @@ -424,24 +416,23 @@ dm_dev_status_ioctl(prop_dictionary_t dm_dict) dm_dev_t *dmv; const char *name, *uuid; uint32_t flags, j, minor; - + name = NULL; uuid = NULL; flags = 0; j = 0; - + prop_dictionary_get_cstring_nocopy(dm_dict, DM_IOCTL_NAME, &name); prop_dictionary_get_cstring_nocopy(dm_dict, DM_IOCTL_UUID, &uuid); prop_dictionary_get_uint32(dm_dict, DM_IOCTL_FLAGS, &flags); prop_dictionary_get_uint32(dm_dict, DM_IOCTL_MINOR, &minor); - + if ((dmv = dm_dev_lookup(name, uuid, minor)) == NULL) { DM_REMOVE_FLAG(flags, DM_EXISTS_FLAG); return ENOENT; } - dm_dbg_print_flags(dmv->flags); - + prop_dictionary_set_uint32(dm_dict, DM_IOCTL_OPEN, dmv->table_head.io_cnt); prop_dictionary_set_uint32(dm_dict, DM_IOCTL_MINOR, dmv->minor); prop_dictionary_set_cstring(dm_dict, DM_IOCTL_UUID, dmv->uuid); @@ -449,25 +440,26 @@ dm_dev_status_ioctl(prop_dictionary_t dm_dict) if (dmv->flags & DM_SUSPEND_FLAG) DM_ADD_FLAG(flags, DM_SUSPEND_FLAG); - /* Add status flags for tables I have to check both - active and inactive tables. */ + /* + * Add status flags for tables I have to check both active and + * inactive tables. + */ if ((j = dm_table_get_target_count(&dmv->table_head, DM_TABLE_ACTIVE))) { DM_ADD_FLAG(flags, DM_ACTIVE_PRESENT_FLAG); } else DM_REMOVE_FLAG(flags, DM_ACTIVE_PRESENT_FLAG); - + prop_dictionary_set_uint32(dm_dict, DM_IOCTL_TARGET_COUNT, j); - + if (dm_table_get_target_count(&dmv->table_head, DM_TABLE_INACTIVE)) DM_ADD_FLAG(flags, DM_INACTIVE_PRESENT_FLAG); else DM_REMOVE_FLAG(flags, DM_INACTIVE_PRESENT_FLAG); dm_dev_unbusy(dmv); - + return 0; } - /* * Set only flag to suggest that device is suspended. This call is * not supported in NetBSD. @@ -479,40 +471,38 @@ dm_dev_suspend_ioctl(prop_dictionary_t dm_dict) dm_dev_t *dmv; const char *name, *uuid; uint32_t flags, minor; - + name = NULL; uuid = NULL; flags = 0; - + prop_dictionary_get_cstring_nocopy(dm_dict, DM_IOCTL_NAME, &name); prop_dictionary_get_cstring_nocopy(dm_dict, DM_IOCTL_UUID, &uuid); prop_dictionary_get_uint32(dm_dict, DM_IOCTL_FLAGS, &flags); prop_dictionary_get_uint32(dm_dict, DM_IOCTL_MINOR, &minor); - - if ((dmv = dm_dev_lookup(name, uuid, minor)) == NULL){ + + if ((dmv = dm_dev_lookup(name, uuid, minor)) == NULL) { DM_REMOVE_FLAG(flags, DM_EXISTS_FLAG); return ENOENT; } - atomic_or_32(&dmv->flags, DM_SUSPEND_FLAG); - + dm_dbg_print_flags(dmv->flags); - + prop_dictionary_set_uint32(dm_dict, DM_IOCTL_OPEN, dmv->table_head.io_cnt); prop_dictionary_set_uint32(dm_dict, DM_IOCTL_FLAGS, dmv->flags); prop_dictionary_set_uint32(dm_dict, DM_IOCTL_MINOR, dmv->minor); - + dm_dev_unbusy(dmv); - + /* Add flags to dictionary flag after dmv -> dict copy */ - DM_ADD_FLAG(flags, DM_EXISTS_FLAG); - + DM_ADD_FLAG(flags, DM_EXISTS_FLAG); + return 0; } - /* * Simulate Linux behaviour better and switch tables here and not in - * dm_table_load_ioctl. + * dm_table_load_ioctl. */ int dm_dev_resume_ioctl(prop_dictionary_t dm_dict) @@ -524,31 +514,31 @@ dm_dev_resume_ioctl(prop_dictionary_t dm_dict) name = NULL; uuid = NULL; flags = 0; - -/* char *xml; - xml = prop_dictionary_externalize(dm_dict); - printf("%s\n",xml);*/ - + + /* + * char *xml; xml = prop_dictionary_externalize(dm_dict); + * printf("%s\n",xml); + */ + prop_dictionary_get_cstring_nocopy(dm_dict, DM_IOCTL_NAME, &name); prop_dictionary_get_cstring_nocopy(dm_dict, DM_IOCTL_UUID, &uuid); prop_dictionary_get_uint32(dm_dict, DM_IOCTL_FLAGS, &flags); prop_dictionary_get_uint32(dm_dict, DM_IOCTL_MINOR, &minor); - + /* Remove device from global device list */ - if ((dmv = dm_dev_lookup(name, uuid, minor)) == NULL){ + if ((dmv = dm_dev_lookup(name, uuid, minor)) == NULL) { DM_REMOVE_FLAG(flags, DM_EXISTS_FLAG); return ENOENT; } - atomic_and_32(&dmv->flags, ~(DM_SUSPEND_FLAG | DM_INACTIVE_PRESENT_FLAG)); atomic_or_32(&dmv->flags, DM_ACTIVE_PRESENT_FLAG); - + dm_table_switch_tables(&dmv->table_head); - - DM_ADD_FLAG(flags, DM_EXISTS_FLAG); + + DM_ADD_FLAG(flags, DM_EXISTS_FLAG); dmgetproperties(dmv->diskp, &dmv->table_head); - + prop_dictionary_set_uint32(dm_dict, DM_IOCTL_OPEN, dmv->table_head.io_cnt); prop_dictionary_set_uint32(dm_dict, DM_IOCTL_FLAGS, flags); prop_dictionary_set_uint32(dm_dict, DM_IOCTL_MINOR, dmv->minor); @@ -557,10 +547,9 @@ dm_dev_resume_ioctl(prop_dictionary_t dm_dict) /* Destroy inactive table after resume. */ dm_table_destroy(&dmv->table_head, DM_TABLE_INACTIVE); - + return 0; } - /* * Table management routines * lvm2tools doens't send name/uuid to kernel with table @@ -579,41 +568,39 @@ dm_table_clear_ioctl(prop_dictionary_t dm_dict) const char *name, *uuid; uint32_t flags, minor; - dmv = NULL; + dmv = NULL; name = NULL; uuid = NULL; flags = 0; minor = 0; - + prop_dictionary_get_cstring_nocopy(dm_dict, DM_IOCTL_NAME, &name); prop_dictionary_get_cstring_nocopy(dm_dict, DM_IOCTL_UUID, &uuid); prop_dictionary_get_uint32(dm_dict, DM_IOCTL_FLAGS, &flags); prop_dictionary_get_uint32(dm_dict, DM_IOCTL_MINOR, &minor); - + aprint_debug("Clearing inactive table from device: %s--%s\n", name, uuid); - - if ((dmv = dm_dev_lookup(name, uuid, minor)) == NULL){ + + if ((dmv = dm_dev_lookup(name, uuid, minor)) == NULL) { DM_REMOVE_FLAG(flags, DM_EXISTS_FLAG); return ENOENT; } - /* Select unused table */ dm_table_destroy(&dmv->table_head, DM_TABLE_INACTIVE); atomic_and_32(&dmv->flags, ~DM_INACTIVE_PRESENT_FLAG); dm_dev_unbusy(dmv); - + return 0; } - /* * Get list of physical devices for active table. * Get dev_t from pdev vnode and insert it into cmd_array. * * XXX. This function is called from lvm2tools to get information - * about physical devices, too e.g. during vgcreate. + * about physical devices, too e.g. during vgcreate. */ int dm_table_deps_ioctl(prop_dictionary_t dm_dict) @@ -631,9 +618,9 @@ dm_table_deps_ioctl(prop_dictionary_t dm_dict) name = NULL; uuid = NULL; - dmv = NULL; + dmv = NULL; flags = 0; - + i = 0; prop_dictionary_get_cstring_nocopy(dm_dict, DM_IOCTL_NAME, &name); @@ -644,37 +631,38 @@ dm_table_deps_ioctl(prop_dictionary_t dm_dict) /* create array for dev_t's */ cmd_array = prop_array_create(); - if ((dmv = dm_dev_lookup(name, uuid, minor)) == NULL){ + if ((dmv = dm_dev_lookup(name, uuid, minor)) == NULL) { DM_REMOVE_FLAG(flags, DM_EXISTS_FLAG); return ENOENT; } - prop_dictionary_set_uint32(dm_dict, DM_IOCTL_MINOR, dmv->minor); prop_dictionary_set_cstring(dm_dict, DM_IOCTL_NAME, dmv->name); prop_dictionary_set_cstring(dm_dict, DM_IOCTL_UUID, dmv->uuid); - + aprint_debug("Getting table deps for device: %s\n", dmv->name); - /* if DM_QUERY_INACTIVE_TABLE_FLAG is passed we need to query INACTIVE TABLE */ + /* + * if DM_QUERY_INACTIVE_TABLE_FLAG is passed we need to query + * INACTIVE TABLE + */ if (flags & DM_QUERY_INACTIVE_TABLE_FLAG) table_type = DM_TABLE_INACTIVE; else table_type = DM_TABLE_ACTIVE; - + tbl = dm_table_get_entry(&dmv->table_head, table_type); SLIST_FOREACH(table_en, tbl, next) - table_en->target->deps(table_en, cmd_array); + table_en->target->deps(table_en, cmd_array); dm_table_release(&dmv->table_head, table_type); dm_dev_unbusy(dmv); - + prop_dictionary_set(dm_dict, DM_IOCTL_CMD_DATA, cmd_array); prop_object_release(cmd_array); - + return 0; } - /* * Load new table/tables to device. * Call apropriate target init routine open all physical pdev's and @@ -690,13 +678,13 @@ dm_table_load_ioctl(prop_dictionary_t dm_dict) { dm_dev_t *dmv; dm_table_entry_t *table_en, *last_table; - dm_table_t *tbl; + dm_table_t *tbl; dm_target_t *target; prop_object_iterator_t iter; prop_array_t cmd_array; prop_dictionary_t target_dict; - + const char *name, *uuid, *type; uint32_t flags, ret, minor; @@ -711,27 +699,27 @@ dm_table_load_ioctl(prop_dictionary_t dm_dict) last_table = NULL; str = NULL; - /* char *xml; - xml = prop_dictionary_externalize(dm_dict); - printf("%s\n",xml);*/ - + /* + * char *xml; xml = prop_dictionary_externalize(dm_dict); + * printf("%s\n",xml); + */ + prop_dictionary_get_cstring_nocopy(dm_dict, DM_IOCTL_NAME, &name); prop_dictionary_get_cstring_nocopy(dm_dict, DM_IOCTL_UUID, &uuid); prop_dictionary_get_uint32(dm_dict, DM_IOCTL_FLAGS, &flags); prop_dictionary_get_uint32(dm_dict, DM_IOCTL_MINOR, &minor); - + cmd_array = prop_dictionary_get(dm_dict, DM_IOCTL_CMD_DATA); iter = prop_array_iterator(cmd_array); - dm_dbg_print_flags(flags); - - if ((dmv = dm_dev_lookup(name, uuid, minor)) == NULL){ + dm_dbg_print_flags(flags); + + if ((dmv = dm_dev_lookup(name, uuid, minor)) == NULL) { DM_REMOVE_FLAG(flags, DM_EXISTS_FLAG); return ENOENT; } - aprint_debug("Loading table to device: %s--%d\n", name, dmv->table_head.cur_active_table); - + /* * I have to check if this table slot is not used by another table list. * if it is used I should free them. @@ -741,12 +729,12 @@ dm_table_load_ioctl(prop_dictionary_t dm_dict) dm_dbg_print_flags(dmv->flags); tbl = dm_table_get_entry(&dmv->table_head, DM_TABLE_INACTIVE); - + aprint_debug("dmv->name = %s\n", dmv->name); - + prop_dictionary_set_uint32(dm_dict, DM_IOCTL_MINOR, dmv->minor); - while((target_dict = prop_object_iterator_next(iter)) != NULL){ + while ((target_dict = prop_object_iterator_next(iter)) != NULL) { prop_dictionary_get_cstring_nocopy(target_dict, DM_TABLE_TYPE, &type); @@ -760,14 +748,12 @@ dm_table_load_ioctl(prop_dictionary_t dm_dict) dm_dev_unbusy(dmv); return ENOENT; } - if ((table_en = kmem_alloc(sizeof(dm_table_entry_t), KM_SLEEP)) == NULL) { dm_table_release(&dmv->table_head, DM_TABLE_INACTIVE); dm_dev_unbusy(dmv); return ENOMEM; } - prop_dictionary_get_uint64(target_dict, DM_TABLE_START, &table_en->start); prop_dictionary_get_uint64(target_dict, DM_TABLE_LENGTH, @@ -776,7 +762,7 @@ dm_table_load_ioctl(prop_dictionary_t dm_dict) table_en->target = target; table_en->dm_dev = dmv; table_en->target_config = NULL; - + /* * There is a parameter string after dm_target_spec * structure which points to /dev/wd0a 284 part of @@ -785,20 +771,20 @@ dm_table_load_ioctl(prop_dictionary_t dm_dict) * use it. */ prop_dictionary_get_cstring(target_dict, - DM_TABLE_PARAMS, (char**)&str); - + DM_TABLE_PARAMS, (char **) &str); + if (SLIST_EMPTY(tbl)) /* insert this table to head */ SLIST_INSERT_HEAD(tbl, table_en, next); else SLIST_INSERT_AFTER(last_table, table_en, next); - + /* * Params string is different for every target, * therfore I have to pass it to target init * routine and parse parameters there. */ - + if ((ret = target->init(dmv, &table_en->target_config, str)) != 0) { @@ -813,15 +799,14 @@ dm_table_load_ioctl(prop_dictionary_t dm_dict) free(str, M_TEMP); } prop_object_iterator_release(iter); - + DM_ADD_FLAG(flags, DM_INACTIVE_PRESENT_FLAG); atomic_or_32(&dmv->flags, DM_INACTIVE_PRESENT_FLAG); - + dm_table_release(&dmv->table_head, DM_TABLE_INACTIVE); dm_dev_unbusy(dmv); return 0; } - /* * Get description of all tables loaded to device from kernel * and send it to libdevmapper. @@ -855,14 +840,14 @@ dm_table_status_ioctl(prop_dictionary_t dm_dict) prop_array_t cmd_array; prop_dictionary_t target_dict; - + uint32_t rec_size, minor; - + const char *name, *uuid; char *params; int flags; int table_type; - + dmv = NULL; uuid = NULL; name = NULL; @@ -876,42 +861,43 @@ dm_table_status_ioctl(prop_dictionary_t dm_dict) prop_dictionary_get_uint32(dm_dict, DM_IOCTL_MINOR, &minor); cmd_array = prop_array_create(); - - if ((dmv = dm_dev_lookup(name, uuid, minor)) == NULL){ + + if ((dmv = dm_dev_lookup(name, uuid, minor)) == NULL) { DM_REMOVE_FLAG(flags, DM_EXISTS_FLAG); return ENOENT; } - - /* if DM_QUERY_INACTIVE_TABLE_FLAG is passed we need to query INACTIVE TABLE */ + /* + * if DM_QUERY_INACTIVE_TABLE_FLAG is passed we need to query + * INACTIVE TABLE + */ if (flags & DM_QUERY_INACTIVE_TABLE_FLAG) table_type = DM_TABLE_INACTIVE; else table_type = DM_TABLE_ACTIVE; - + if (dm_table_get_target_count(&dmv->table_head, DM_TABLE_ACTIVE)) DM_ADD_FLAG(flags, DM_ACTIVE_PRESENT_FLAG); else { DM_REMOVE_FLAG(flags, DM_ACTIVE_PRESENT_FLAG); - + if (dm_table_get_target_count(&dmv->table_head, DM_TABLE_INACTIVE)) DM_ADD_FLAG(flags, DM_INACTIVE_PRESENT_FLAG); else { DM_REMOVE_FLAG(flags, DM_INACTIVE_PRESENT_FLAG); } } - + if (dmv->flags & DM_SUSPEND_FLAG) DM_ADD_FLAG(flags, DM_SUSPEND_FLAG); - + prop_dictionary_set_uint32(dm_dict, DM_IOCTL_MINOR, dmv->minor); - + aprint_debug("Status of device tables: %s--%d\n", name, dmv->table_head.cur_active_table); - + tbl = dm_table_get_entry(&dmv->table_head, table_type); - - SLIST_FOREACH(table_en, tbl, next) - { + + SLIST_FOREACH(table_en, tbl, next) { target_dict = prop_dictionary_create(); aprint_debug("%016" PRIu64 ", length %016" PRIu64 ", target %s\n", table_en->start, table_en->length, @@ -933,14 +919,13 @@ dm_table_status_ioctl(prop_dictionary_t dm_dict) params = table_en->target->status (table_en->target_config); - if(params != NULL){ + if (params != NULL) { prop_dictionary_set_cstring(target_dict, DM_TABLE_PARAMS, params); - + kmem_free(params, DM_MAX_PARAMS_SIZE); } } - prop_array_add(cmd_array, target_dict); prop_object_release(target_dict); } @@ -951,7 +936,7 @@ dm_table_status_ioctl(prop_dictionary_t dm_dict) prop_dictionary_set_uint32(dm_dict, DM_IOCTL_FLAGS, flags); prop_dictionary_set(dm_dict, DM_IOCTL_CMD_DATA, cmd_array); prop_object_release(cmd_array); - + return 0; } @@ -959,7 +944,7 @@ dm_table_status_ioctl(prop_dictionary_t dm_dict) /* * For every call I have to set kernel driver version. * Because I can have commands supported only in other - * newer/later version. This routine is called for every + * newer/later version. This routine is called for every * ioctl command. */ int @@ -968,26 +953,25 @@ dm_check_version(prop_dictionary_t dm_dict) size_t i; int dm_version[3]; prop_array_t ver; - + ver = prop_dictionary_get(dm_dict, DM_IOCTL_VERSION); - - for(i=0; i < 3; i++) + + for (i = 0; i < 3; i++) prop_array_get_uint32(ver, i, &dm_version[i]); - if (DM_VERSION_MAJOR != dm_version[0] || DM_VERSION_MINOR < dm_version[1]){ + if (DM_VERSION_MAJOR != dm_version[0] || DM_VERSION_MINOR < dm_version[1]) { aprint_debug("libdevmapper/kernel version mismatch " "kernel: %d.%d.%d libdevmapper: %d.%d.%d\n", DM_VERSION_MAJOR, DM_VERSION_MINOR, DM_VERSION_PATCHLEVEL, dm_version[0], dm_version[1], dm_version[2]); - + return EIO; } - prop_array_set_uint32(ver, 0, DM_VERSION_MAJOR); prop_array_set_uint32(ver, 1, DM_VERSION_MINOR); prop_array_set_uint32(ver, 2, DM_VERSION_PATCHLEVEL); prop_dictionary_set(dm_dict, DM_IOCTL_VERSION, ver); - + return 0; } |
