Commit 8ca817c4 authored by Heinz Mauelshagen's avatar Heinz Mauelshagen Committed by Mike Snitzer

dm: avoid spaces before function arguments or in favour of tabs

Signed-off-by: default avatarHeinz Mauelshagen <heinzm@redhat.com>
Signed-off-by: default avatarMike Snitzer <snitzer@kernel.org>
parent beecc843
...@@ -78,9 +78,9 @@ static void __setup_new_cell(struct dm_cell_key *key, ...@@ -78,9 +78,9 @@ static void __setup_new_cell(struct dm_cell_key *key,
struct bio *holder, struct bio *holder,
struct dm_bio_prison_cell *cell) struct dm_bio_prison_cell *cell)
{ {
memcpy(&cell->key, key, sizeof(cell->key)); memcpy(&cell->key, key, sizeof(cell->key));
cell->holder = holder; cell->holder = holder;
bio_list_init(&cell->bios); bio_list_init(&cell->bios);
} }
static int cmp_keys(struct dm_cell_key *lhs, static int cmp_keys(struct dm_cell_key *lhs,
......
...@@ -181,14 +181,14 @@ static void continue_after_commit(struct batcher *b, struct continuation *k) ...@@ -181,14 +181,14 @@ static void continue_after_commit(struct batcher *b, struct continuation *k)
*/ */
static void issue_after_commit(struct batcher *b, struct bio *bio) static void issue_after_commit(struct batcher *b, struct bio *bio)
{ {
bool commit_scheduled; bool commit_scheduled;
spin_lock_irq(&b->lock); spin_lock_irq(&b->lock);
commit_scheduled = b->commit_scheduled; commit_scheduled = b->commit_scheduled;
bio_list_add(&b->bios, bio); bio_list_add(&b->bios, bio);
spin_unlock_irq(&b->lock); spin_unlock_irq(&b->lock);
if (commit_scheduled) if (commit_scheduled)
async_commit(b); async_commit(b);
} }
......
...@@ -242,7 +242,7 @@ static void __ebs_process_bios(struct work_struct *ws) ...@@ -242,7 +242,7 @@ static void __ebs_process_bios(struct work_struct *ws)
* <offset>: offset in 512 bytes sectors into <dev_path> * <offset>: offset in 512 bytes sectors into <dev_path>
* <ebs>: emulated block size in units of 512 bytes exposed to the upper layer * <ebs>: emulated block size in units of 512 bytes exposed to the upper layer
* [<ubs>]: underlying block size in units of 512 bytes imposed on the lower layer; * [<ubs>]: underlying block size in units of 512 bytes imposed on the lower layer;
* optional, if not supplied, retrieve logical block size from underlying device * optional, if not supplied, retrieve logical block size from underlying device
*/ */
static int ebs_ctr(struct dm_target *ti, unsigned int argc, char **argv) static int ebs_ctr(struct dm_target *ti, unsigned int argc, char **argv)
{ {
......
...@@ -44,36 +44,36 @@ struct dm_exception_store_type { ...@@ -44,36 +44,36 @@ struct dm_exception_store_type {
const char *name; const char *name;
struct module *module; struct module *module;
int (*ctr) (struct dm_exception_store *store, char *options); int (*ctr)(struct dm_exception_store *store, char *options);
/* /*
* Destroys this object when you've finished with it. * Destroys this object when you've finished with it.
*/ */
void (*dtr) (struct dm_exception_store *store); void (*dtr)(struct dm_exception_store *store);
/* /*
* The target shouldn't read the COW device until this is * The target shouldn't read the COW device until this is
* called. As exceptions are read from the COW, they are * called. As exceptions are read from the COW, they are
* reported back via the callback. * reported back via the callback.
*/ */
int (*read_metadata) (struct dm_exception_store *store, int (*read_metadata)(struct dm_exception_store *store,
int (*callback)(void *callback_context, int (*callback)(void *callback_context,
chunk_t old, chunk_t new), chunk_t old, chunk_t new),
void *callback_context); void *callback_context);
/* /*
* Find somewhere to store the next exception. * Find somewhere to store the next exception.
*/ */
int (*prepare_exception) (struct dm_exception_store *store, int (*prepare_exception)(struct dm_exception_store *store,
struct dm_exception *e); struct dm_exception *e);
/* /*
* Update the metadata with this exception. * Update the metadata with this exception.
*/ */
void (*commit_exception) (struct dm_exception_store *store, void (*commit_exception)(struct dm_exception_store *store,
struct dm_exception *e, int valid, struct dm_exception *e, int valid,
void (*callback) (void *, int success), void (*callback)(void *, int success),
void *callback_context); void *callback_context);
/* /*
* Returns 0 if the exception store is empty. * Returns 0 if the exception store is empty.
...@@ -83,30 +83,30 @@ struct dm_exception_store_type { ...@@ -83,30 +83,30 @@ struct dm_exception_store_type {
* still-to-be-merged chunk and returns the number of * still-to-be-merged chunk and returns the number of
* consecutive previous ones. * consecutive previous ones.
*/ */
int (*prepare_merge) (struct dm_exception_store *store, int (*prepare_merge)(struct dm_exception_store *store,
chunk_t *last_old_chunk, chunk_t *last_new_chunk); chunk_t *last_old_chunk, chunk_t *last_new_chunk);
/* /*
* Clear the last n exceptions. * Clear the last n exceptions.
* nr_merged must be <= the value returned by prepare_merge. * nr_merged must be <= the value returned by prepare_merge.
*/ */
int (*commit_merge) (struct dm_exception_store *store, int nr_merged); int (*commit_merge)(struct dm_exception_store *store, int nr_merged);
/* /*
* The snapshot is invalid, note this in the metadata. * The snapshot is invalid, note this in the metadata.
*/ */
void (*drop_snapshot) (struct dm_exception_store *store); void (*drop_snapshot)(struct dm_exception_store *store);
unsigned int (*status) (struct dm_exception_store *store, unsigned int (*status)(struct dm_exception_store *store,
status_type_t status, char *result, status_type_t status, char *result,
unsigned int maxlen); unsigned int maxlen);
/* /*
* Return how full the snapshot is. * Return how full the snapshot is.
*/ */
void (*usage) (struct dm_exception_store *store, void (*usage)(struct dm_exception_store *store,
sector_t *total_sectors, sector_t *sectors_allocated, sector_t *total_sectors, sector_t *sectors_allocated,
sector_t *metadata_sectors); sector_t *metadata_sectors);
/* For internal device-mapper use only. */ /* For internal device-mapper use only. */
struct list_head list; struct list_head list;
......
...@@ -54,10 +54,10 @@ struct hash_cell { ...@@ -54,10 +54,10 @@ struct hash_cell {
}; };
struct vers_iter { struct vers_iter {
size_t param_size; size_t param_size;
struct dm_target_versions *vers, *old_vers; struct dm_target_versions *vers, *old_vers;
char *end; char *end;
uint32_t flags; uint32_t flags;
}; };
...@@ -661,36 +661,34 @@ static int list_devices(struct file *filp, struct dm_ioctl *param, size_t param_ ...@@ -661,36 +661,34 @@ static int list_devices(struct file *filp, struct dm_ioctl *param, size_t param_
static void list_version_get_needed(struct target_type *tt, void *needed_param) static void list_version_get_needed(struct target_type *tt, void *needed_param)
{ {
size_t *needed = needed_param; size_t *needed = needed_param;
*needed += sizeof(struct dm_target_versions); *needed += sizeof(struct dm_target_versions);
*needed += strlen(tt->name) + 1; *needed += strlen(tt->name) + 1;
*needed += ALIGN_MASK; *needed += ALIGN_MASK;
} }
static void list_version_get_info(struct target_type *tt, void *param) static void list_version_get_info(struct target_type *tt, void *param)
{ {
struct vers_iter *info = param; struct vers_iter *info = param;
/* Check space - it might have changed since the first iteration */ /* Check space - it might have changed since the first iteration */
if ((char *)info->vers + sizeof(tt->version) + strlen(tt->name) + 1 > if ((char *)info->vers + sizeof(tt->version) + strlen(tt->name) + 1 > info->end) {
info->end) { info->flags = DM_BUFFER_FULL_FLAG;
return;
}
info->flags = DM_BUFFER_FULL_FLAG; if (info->old_vers)
return; info->old_vers->next = (uint32_t) ((void *)info->vers - (void *)info->old_vers);
}
if (info->old_vers) info->vers->version[0] = tt->version[0];
info->old_vers->next = (uint32_t) ((void *)info->vers - info->vers->version[1] = tt->version[1];
(void *)info->old_vers); info->vers->version[2] = tt->version[2];
info->vers->version[0] = tt->version[0]; info->vers->next = 0;
info->vers->version[1] = tt->version[1]; strcpy(info->vers->name, tt->name);
info->vers->version[2] = tt->version[2];
info->vers->next = 0;
strcpy(info->vers->name, tt->name);
info->old_vers = info->vers; info->old_vers = info->vers;
info->vers = align_ptr((void *)(info->vers + 1) + strlen(tt->name) + 1); info->vers = align_ptr((void *)(info->vers + 1) + strlen(tt->name) + 1);
} }
static int __list_versions(struct dm_ioctl *param, size_t param_size, const char *name) static int __list_versions(struct dm_ioctl *param, size_t param_size, const char *name)
...@@ -2095,9 +2093,9 @@ static const struct file_operations _ctl_fops = { ...@@ -2095,9 +2093,9 @@ static const struct file_operations _ctl_fops = {
static struct miscdevice _dm_misc = { static struct miscdevice _dm_misc = {
.minor = MAPPER_CTRL_MINOR, .minor = MAPPER_CTRL_MINOR,
.name = DM_NAME, .name = DM_NAME,
.nodename = DM_DIR "/" DM_CONTROL_NODE, .nodename = DM_DIR "/" DM_CONTROL_NODE,
.fops = &_ctl_fops .fops = &_ctl_fops
}; };
MODULE_ALIAS_MISCDEV(MAPPER_CTRL_MINOR); MODULE_ALIAS_MISCDEV(MAPPER_CTRL_MINOR);
......
...@@ -608,7 +608,7 @@ static int run_pages_job(struct kcopyd_job *job) ...@@ -608,7 +608,7 @@ static int run_pages_job(struct kcopyd_job *job)
* of successful jobs. * of successful jobs.
*/ */
static int process_jobs(struct list_head *jobs, struct dm_kcopyd_client *kc, static int process_jobs(struct list_head *jobs, struct dm_kcopyd_client *kc,
int (*fn) (struct kcopyd_job *)) int (*fn)(struct kcopyd_job *))
{ {
struct kcopyd_job *job; struct kcopyd_job *job;
int r, count = 0; int r, count = 0;
......
...@@ -53,44 +53,43 @@ struct path_selector_type { ...@@ -53,44 +53,43 @@ struct path_selector_type {
/* /*
* Constructs a path selector object, takes custom arguments * Constructs a path selector object, takes custom arguments
*/ */
int (*create) (struct path_selector *ps, unsigned int argc, char **argv); int (*create)(struct path_selector *ps, unsigned int argc, char **argv);
void (*destroy) (struct path_selector *ps); void (*destroy)(struct path_selector *ps);
/* /*
* Add an opaque path object, along with some selector specific * Add an opaque path object, along with some selector specific
* path args (eg, path priority). * path args (eg, path priority).
*/ */
int (*add_path) (struct path_selector *ps, struct dm_path *path, int (*add_path)(struct path_selector *ps, struct dm_path *path,
int argc, char **argv, char **error); int argc, char **argv, char **error);
/* /*
* Chooses a path for this io, if no paths are available then * Chooses a path for this io, if no paths are available then
* NULL will be returned. * NULL will be returned.
*/ */
struct dm_path *(*select_path) (struct path_selector *ps, struct dm_path *(*select_path)(struct path_selector *ps, size_t nr_bytes);
size_t nr_bytes);
/* /*
* Notify the selector that a path has failed. * Notify the selector that a path has failed.
*/ */
void (*fail_path) (struct path_selector *ps, struct dm_path *p); void (*fail_path)(struct path_selector *ps, struct dm_path *p);
/* /*
* Ask selector to reinstate a path. * Ask selector to reinstate a path.
*/ */
int (*reinstate_path) (struct path_selector *ps, struct dm_path *p); int (*reinstate_path)(struct path_selector *ps, struct dm_path *p);
/* /*
* Table content based on parameters added in ps_add_path_fn * Table content based on parameters added in ps_add_path_fn
* or path selector status * or path selector status
*/ */
int (*status) (struct path_selector *ps, struct dm_path *path, int (*status)(struct path_selector *ps, struct dm_path *path,
status_type_t type, char *result, unsigned int maxlen); status_type_t type, char *result, unsigned int maxlen);
int (*start_io) (struct path_selector *ps, struct dm_path *path, int (*start_io)(struct path_selector *ps, struct dm_path *path,
size_t nr_bytes); size_t nr_bytes);
int (*end_io) (struct path_selector *ps, struct dm_path *path, int (*end_io)(struct path_selector *ps, struct dm_path *path,
size_t nr_bytes, u64 start_time); size_t nr_bytes, u64 start_time);
}; };
/* Register a path selector */ /* Register a path selector */
......
...@@ -123,8 +123,8 @@ static int ql_add_path(struct path_selector *ps, struct dm_path *path, ...@@ -123,8 +123,8 @@ static int ql_add_path(struct path_selector *ps, struct dm_path *path,
/* /*
* Arguments: [<repeat_count>] * Arguments: [<repeat_count>]
* <repeat_count>: The number of I/Os before switching path. * <repeat_count>: The number of I/Os before switching path.
* If not given, default (QL_MIN_IO) is used. * If not given, default (QL_MIN_IO) is used.
*/ */
if (argc > 1) { if (argc > 1) {
*error = "queue-length ps: incorrect number of arguments"; *error = "queue-length ps: incorrect number of arguments";
......
...@@ -121,11 +121,11 @@ static int st_add_path(struct path_selector *ps, struct dm_path *path, ...@@ -121,11 +121,11 @@ static int st_add_path(struct path_selector *ps, struct dm_path *path,
/* /*
* Arguments: [<repeat_count> [<relative_throughput>]] * Arguments: [<repeat_count> [<relative_throughput>]]
* <repeat_count>: The number of I/Os before switching path. * <repeat_count>: The number of I/Os before switching path.
* If not given, default (ST_MIN_IO) is used. * If not given, default (ST_MIN_IO) is used.
* <relative_throughput>: The relative throughput value of * <relative_throughput>: The relative throughput value of
* the path among all paths in the path-group. * the path among all paths in the path-group.
* The valid range: 0-<ST_MAX_RELATIVE_THROUGHPUT> * The valid range: 0-<ST_MAX_RELATIVE_THROUGHPUT>
* If not given, minimum value '1' is used. * If not given, minimum value '1' is used.
* If '0' is given, the path isn't selected while * If '0' is given, the path isn't selected while
* other paths having a positive value are available. * other paths having a positive value are available.
......
...@@ -595,7 +595,7 @@ static void do_reads(struct mirror_set *ms, struct bio_list *reads) ...@@ -595,7 +595,7 @@ static void do_reads(struct mirror_set *ms, struct bio_list *reads)
* We do different things with the write io depending on the * We do different things with the write io depending on the
* state of the region that it's in: * state of the region that it's in:
* *
* SYNC: increment pending, use kcopyd to write to *all* mirrors * SYNC: increment pending, use kcopyd to write to *all* mirrors
* RECOVERING: delay the io until recovery completes * RECOVERING: delay the io until recovery completes
* NOSYNC: increment pending, just write to the default mirror * NOSYNC: increment pending, just write to the default mirror
*--------------------------------------------------------------------- *---------------------------------------------------------------------
......
...@@ -695,7 +695,7 @@ static int persistent_prepare_exception(struct dm_exception_store *store, ...@@ -695,7 +695,7 @@ static int persistent_prepare_exception(struct dm_exception_store *store,
static void persistent_commit_exception(struct dm_exception_store *store, static void persistent_commit_exception(struct dm_exception_store *store,
struct dm_exception *e, int valid, struct dm_exception *e, int valid,
void (*callback) (void *, int success), void (*callback)(void *, int success),
void *callback_context) void *callback_context)
{ {
unsigned int i; unsigned int i;
......
...@@ -56,7 +56,7 @@ static int transient_prepare_exception(struct dm_exception_store *store, ...@@ -56,7 +56,7 @@ static int transient_prepare_exception(struct dm_exception_store *store,
static void transient_commit_exception(struct dm_exception_store *store, static void transient_commit_exception(struct dm_exception_store *store,
struct dm_exception *e, int valid, struct dm_exception *e, int valid,
void (*callback) (void *, int success), void (*callback)(void *, int success),
void *callback_context) void *callback_context)
{ {
/* Just succeed */ /* Just succeed */
......
...@@ -123,11 +123,11 @@ struct dm_snapshot { ...@@ -123,11 +123,11 @@ struct dm_snapshot {
* The merge operation failed if this flag is set. * The merge operation failed if this flag is set.
* Failure modes are handled as follows: * Failure modes are handled as follows:
* - I/O error reading the header * - I/O error reading the header
* => don't load the target; abort. * => don't load the target; abort.
* - Header does not have "valid" flag set * - Header does not have "valid" flag set
* => use the origin; forget about the snapshot. * => use the origin; forget about the snapshot.
* - I/O error when reading exceptions * - I/O error when reading exceptions
* => don't load the target; abort. * => don't load the target; abort.
* (We can't use the intermediate origin state.) * (We can't use the intermediate origin state.)
* - I/O error while merging * - I/O error while merging
* => stop merging; set merge_failed; process I/O normally. * => stop merging; set merge_failed; process I/O normally.
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* Device Mapper Uevent Support (dm-uevent) * Device Mapper Uevent Support (dm-uevent)
* *
* Copyright IBM Corporation, 2007 * Copyright IBM Corporation, 2007
* Author: Mike Anderson <andmike@linux.vnet.ibm.com> * Author: Mike Anderson <andmike@linux.vnet.ibm.com>
*/ */
#include <linux/list.h> #include <linux/list.h>
#include <linux/slab.h> #include <linux/slab.h>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment