 @@ -1,14 +1,14 @@
-/*        $NetBSD: dm.h,v 1.22 2010/12/23 20:07:13 christos Exp $      */
+/*        $NetBSD: dm.h,v 1.23 2011/08/27 17:07:49 ahoka Exp $      */
 /*
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Adam Hamsik.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -78,27 +78,27 @@ typedef struct dm_table_entry {
 	uint64_t length;
 	struct dm_target *target;      /* Link to table target. */
 	void *target_config;           /* Target specific data. */
 	SLIST_ENTRY(dm_table_entry) next;
 } dm_table_entry_t;
 SLIST_HEAD(dm_table, dm_table_entry);
 typedef struct dm_table dm_table_t;
 typedef struct dm_table_head {
 	/* Current active table is selected with this. */
 	int cur_active_table;
 	struct dm_table tables[2];
 	kmutex_t   table_mtx;
 	kcondvar_t table_cv; /*IO waiting cv */
 	uint32_t io_cnt;
 } dm_table_head_t;
 #define MAX_DEV_NAME 32
 /*
  * This structure is used to store opened vnodes for disk with name.
  * I need this because devices can be opened only once, but I can
 @@ -111,74 +111,74 @@ typedef struct dm_pdev {
 	struct vnode *pdev_vnode;
 	uint64_t pdev_numsec;
 	unsigned pdev_secsize;
 	int ref_cnt; /* reference counter for users ofthis pdev */
 	SLIST_ENTRY(dm_pdev) next_pdev;
 } dm_pdev_t;
 /*
  * This structure is called for every device-mapper device.
  * It points to SLIST of device tables and mirrored, snapshoted etc. devices.
  */
 TAILQ_HEAD(dm_dev_head, dm_dev) dm_devs;
 typedef struct dm_dev {
 	char name[DM_NAME_LEN];
 	char uuid[DM_UUID_LEN];
 	device_t devt; /* pointer to autoconf device_t structure */
 	uint64_t minor; /* Device minor number */
 	uint32_t flags; /* store communication protocol flags */
 	kmutex_t dev_mtx; /* mutex for generall device lock */
 	kcondvar_t dev_cv; /* cv for between ioctl synchronisation */
 	uint32_t event_nr;
 	uint32_t ref_cnt;
 	uint32_t dev_type;
 	dm_table_head_t table_head;
 	struct dm_dev_head upcalls;
 	struct disk *diskp;
 	kmutex_t diskp_mtx;
 	TAILQ_ENTRY(dm_dev) next_upcall; /* LIST of mirrored, snapshoted devices. */
 	TAILQ_ENTRY(dm_dev) next_devlist; /* Major device list. */
 } dm_dev_t;
 /* Device types used for upcalls */
 #define DM_ZERO_DEV            (1 << 0)
 #define DM_ERROR_DEV           (1 << 1)
 #define DM_LINEAR_DEV          (1 << 2)
 #define DM_MIRROR_DEV          (1 << 3)
 #define DM_STRIPE_DEV          (1 << 4)
 #define DM_SNAPSHOT_DEV        (1 << 5)
 #define DM_SNAPSHOT_ORIG_DEV   (1 << 6)
 #define DM_SPARE_DEV           (1 << 7)
 /* Set this device type only during dev remove ioctl. */
 #define DM_DELETING_DEV        (1 << 8)
 /* for zero, error : dm_target->target_config == NULL */
 /*
  * Target config is initiated with target_init function.
  */
 /* for linear : */
 typedef struct target_linear_config {
 	dm_pdev_t *pdev;
 	uint64_t offset;
 	TAILQ_ENTRY(target_linear_config) entries;
 } dm_target_linear_config_t;
 /*
  * Striping devices are stored in a linked list, this might be inefficient
  * for more than 8 striping devices and can be changed to something more
  * scalable.
  * TODO: look for other options than linked list.
  */
 @@ -204,61 +204,61 @@ typedef struct target_mirror_config {
 	/* copied blocks bitmaps administration etc*/
 	dm_pdev_t *log_pdev;	/* for administration */
 	uint64_t log_regionsize;	/* blocksize of mirror */
 	/* list of parts that still need copied etc.; run length encoded? */
 } dm_target_mirror_config_t;
 /* for snapshot : */
 typedef struct target_snapshot_config {
 	dm_pdev_t *tsc_snap_dev;
 	/* cow dev is set only for persistent snapshot devices */
 	dm_pdev_t *tsc_cow_dev;
 	uint64_t tsc_chunk_size;
 	uint32_t tsc_persistent_dev;
 } dm_target_snapshot_config_t;
 /* for snapshot-origin devices */
 typedef struct target_snapshot_origin_config {
 	dm_pdev_t *tsoc_real_dev;
 	/* list of snapshots ? */
 } dm_target_snapshot_origin_config_t;
 /* constant dm_target structures for error, zero, linear, stripes etc. */
 typedef struct dm_target {
 	char name[DM_MAX_TYPE_NAME];
 	/* Initialize target_config area */
 	int (*init)(dm_dev_t *, void **, char *);
 	/* Destroy target_config area */
 	int (*destroy)(dm_table_entry_t *);
 	int (*deps) (dm_table_entry_t *, prop_array_t);
 	/*
 	 * Status routine is called to get params string, which is target
 	 * specific. When dm_table_status_ioctl is called with flag
 	 * DM_STATUS_TABLE_FLAG I have to sent params string back.
 	 */
 	char * (*status)(void *);
 	int (*strategy)(dm_table_entry_t *, struct buf *);
 	int (*sync)(dm_table_entry_t *);
 	int (*upcall)(dm_table_entry_t *, struct buf *);
 	int (*secsize)(dm_table_entry_t *, unsigned *);
 	uint32_t version[3];
 	int ref_cnt;
 	TAILQ_ENTRY(dm_target) dm_target_next;
 } dm_target_t;
 /* Interface structures */
 /*
  * This structure is used to translate command sent to kernel driver in
  * <key>command</key>
  * <value></value>
  * to function which I can call, and if the command is allowed for
  * non-superusers.
  */
 struct cmd_function {
 @@ -305,44 +305,45 @@ int dm_target_init(void);
 #define DM_MAX_PARAMS_SIZE 1024
 /* dm_target_linear.c */
 int dm_target_linear_init(dm_dev_t *, void**, char *);
 char * dm_target_linear_status(void *);
 int dm_target_linear_strategy(dm_table_entry_t *, struct buf *);
 int dm_target_linear_sync(dm_table_entry_t *);
 int dm_target_linear_deps(dm_table_entry_t *, prop_array_t);
 int dm_target_linear_destroy(dm_table_entry_t *);
 int dm_target_linear_upcall(dm_table_entry_t *, struct buf *);
 int dm_target_linear_secsize(dm_table_entry_t *, unsigned *);
 /* Generic function used to convert char to string */
 uint64_t atoi(const char *);
 /* dm_target_stripe.c */
 int dm_target_stripe_init(dm_dev_t *, void**, char *);
 char * dm_target_stripe_status(void *);
 int dm_target_stripe_strategy(dm_table_entry_t *, struct buf *);
 int dm_target_stripe_sync(dm_table_entry_t *);
 int dm_target_stripe_deps(dm_table_entry_t *, prop_array_t);
 int dm_target_stripe_destroy(dm_table_entry_t *);
 int dm_target_stripe_upcall(dm_table_entry_t *, struct buf *);
 int dm_target_stripe_secsize(dm_table_entry_t *, unsigned *);
 /* dm_table.c  */
 #define DM_TABLE_ACTIVE 0
 #define DM_TABLE_INACTIVE 1
 int dm_table_destroy(dm_table_head_t *, uint8_t);
 uint64_t dm_table_size(dm_table_head_t *);
 uint64_t dm_inactive_table_size(dm_table_head_t *);
 void dm_table_disksize(dm_table_head_t *, uint64_t *, unsigned *);
 dm_table_t * dm_table_get_entry(dm_table_head_t *, uint8_t);
 int dm_table_get_target_count(dm_table_head_t *, uint8_t);
 void dm_table_release(dm_table_head_t *, uint8_t s);
 void dm_table_switch_tables(dm_table_head_t *);
 void dm_table_head_init(dm_table_head_t *);
 void dm_table_head_destroy(dm_table_head_t *);
 /* dm_dev.c */
 dm_dev_t* dm_dev_alloc(void);
 void dm_dev_busy(dm_dev_t *);
 int dm_dev_destroy(void);
 dm_dev_t* dm_dev_detach(device_t);

 @@ -1,14 +1,14 @@
-/* $NetBSD: dm_ioctl.c,v 1.25 2011/05/24 15:23:41 joerg Exp $      */
+/* $NetBSD: dm_ioctl.c,v 1.26 2011/08/27 17:07:49 ahoka Exp $      */
 /*
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Adam Hamsik.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -783,26 +783,27 @@ dm_table_load_ioctl(prop_dictionary_t dm
 		 * 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) {
 			dm_table_release(&dmv->table_head, DM_TABLE_INACTIVE);
 			dm_table_destroy(&dmv->table_head, DM_TABLE_INACTIVE);
 			free(str, M_TEMP);
 			dm_dev_unbusy(dmv);
 			dm_target_unbusy(target);
 			return ret;
+		}
 		last_table = table_en;
 		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;