diff options
| -rw-r--r-- | drivers/md/dm-bufio.c | 6 | ||||
| -rw-r--r-- | drivers/md/dm-core.h | 2 | ||||
| -rw-r--r-- | drivers/md/dm-era-target.c | 10 | ||||
| -rw-r--r-- | drivers/md/dm-snap-persistent.c | 2 | ||||
| -rw-r--r-- | drivers/md/dm-sysfs.c | 4 |
5 files changed, 12 insertions, 12 deletions
diff --git a/drivers/md/dm-bufio.c b/drivers/md/dm-bufio.c index 8f600e9cb8d3..b3dee6d61916 100644 --- a/drivers/md/dm-bufio.c +++ b/drivers/md/dm-bufio.c @@ -92,8 +92,8 @@ struct dm_bufio_client { struct block_device *bdev; unsigned int block_size; s8 sectors_per_block_bits; - void (*alloc_callback)(struct dm_buffer *); - void (*write_callback)(struct dm_buffer *); + void (*alloc_callback)(struct dm_buffer *buf); + void (*write_callback)(struct dm_buffer *buf); struct kmem_cache *slab_buffer; struct kmem_cache *slab_cache; struct dm_io_client *dm_io; @@ -156,7 +156,7 @@ struct dm_buffer { unsigned int write_end; struct dm_bufio_client *c; struct list_head write_list; - void (*end_io)(struct dm_buffer *, blk_status_t); + void (*end_io)(struct dm_buffer *buf, blk_status_t stat); #ifdef CONFIG_DM_DEBUG_BLOCK_STACK_TRACING #define MAX_STACK 10 unsigned int stack_len; diff --git a/drivers/md/dm-core.h b/drivers/md/dm-core.h index 297ccc79008e..aecab0c0720f 100644 --- a/drivers/md/dm-core.h +++ b/drivers/md/dm-core.h @@ -217,7 +217,7 @@ struct dm_table { struct list_head devices; /* events get handed up using this callback */ - void (*event_fn)(void *); + void (*event_fn)(void *data); void *event_context; struct dm_md_mempools *mempools; diff --git a/drivers/md/dm-era-target.c b/drivers/md/dm-era-target.c index c4fd79135794..a42cfd950e04 100644 --- a/drivers/md/dm-era-target.c +++ b/drivers/md/dm-era-target.c @@ -682,7 +682,7 @@ struct digest { __le32 value; struct dm_disk_bitset info; - int (*step)(struct era_metadata *, struct digest *); + int (*step)(struct era_metadata *md, struct digest *d); }; static int metadata_digest_lookup_writeset(struct era_metadata *md, @@ -1193,8 +1193,8 @@ struct era { struct rpc { struct list_head list; - int (*fn0)(struct era_metadata *); - int (*fn1)(struct era_metadata *, void *); + int (*fn0)(struct era_metadata *md); + int (*fn1)(struct era_metadata *md, void *ref); void *arg; int result; @@ -1388,7 +1388,7 @@ static int perform_rpc(struct era *era, struct rpc *rpc) return rpc->result; } -static int in_worker0(struct era *era, int (*fn)(struct era_metadata *)) +static int in_worker0(struct era *era, int (*fn)(struct era_metadata *md)) { struct rpc rpc; rpc.fn0 = fn; @@ -1398,7 +1398,7 @@ static int in_worker0(struct era *era, int (*fn)(struct era_metadata *)) } static int in_worker1(struct era *era, - int (*fn)(struct era_metadata *, void *), void *arg) + int (*fn)(struct era_metadata *md, void *ref), void *arg) { struct rpc rpc; rpc.fn0 = NULL; diff --git a/drivers/md/dm-snap-persistent.c b/drivers/md/dm-snap-persistent.c index 570a7722c936..170eac3f2e86 100644 --- a/drivers/md/dm-snap-persistent.c +++ b/drivers/md/dm-snap-persistent.c @@ -95,7 +95,7 @@ struct core_exception { }; struct commit_callback { - void (*callback)(void *, int success); + void (*callback)(void *ref, int success); void *context; }; diff --git a/drivers/md/dm-sysfs.c b/drivers/md/dm-sysfs.c index a32a5628f04d..f25274b5b73e 100644 --- a/drivers/md/dm-sysfs.c +++ b/drivers/md/dm-sysfs.c @@ -12,8 +12,8 @@ struct dm_sysfs_attr { struct attribute attr; - ssize_t (*show)(struct mapped_device *, char *); - ssize_t (*store)(struct mapped_device *, const char *, size_t count); + ssize_t (*show)(struct mapped_device *md, char *p); + ssize_t (*store)(struct mapped_device *md, const char *p, size_t count); }; #define DM_ATTR_RO(_name) \ |