o dm_destroy_all() called on exit - but doesn't touch suspended devices yet.

o 'dmsetup remove_all' calls dm_destroy_all() to provide a quick way to
  prepare for unloading the module
o Ran through indent again.

diff --git a/VERSION b/VERSION
index 60c8a981a1ee370a47d461ac45612821be676e7f..7594ac5cadb1b2a10a96b8c6db09cd5b3fb07656 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.95.03-cvs (2002-03-05)
+0.95.04-cvs (2002-03-07)

diff --git a/dmsetup/dmsetup.c b/dmsetup/dmsetup.c
index b31b26764a62d5af7630f527469767737cafbfa6..fe6e2e1412c7c5b9cdf6ea26f8c7fb134ceb969a 100644 (file)
--- a/dmsetup/dmsetup.c
+++ b/dmsetup/dmsetup.c
@@ -36,23 +36,22 @@ enum {
 static int _switches[NUM_SWITCHES];
 static int _values[NUM_SWITCHES];
 
-
 /*
  * Commands
  */
 static int _parse_file(struct dm_task *dmt, const char *file)
 {
-        char buffer[LINE_SIZE], *ttype, *ptr, *comment;
-        FILE *fp = fopen(file, "r");
-        unsigned long long start, size;
-        int r = 0, n, line = 0;
+       char buffer[LINE_SIZE], *ttype, *ptr, *comment;
+       FILE *fp = fopen(file, "r");
+       unsigned long long start, size;
+       int r = 0, n, line = 0;
 
-        if (!fp) {
-                err("Couldn't open '%s' for reading", file);
-                return 0;
-        }
+       if (!fp) {
+               err("Couldn't open '%s' for reading", file);
+               return 0;
+       }
 
-        while (fgets(buffer, sizeof(buffer), fp)) {
+       while (fgets(buffer, sizeof(buffer), fp)) {
                line++;
 
                /* trim trailing space */
@@ -63,32 +62,31 @@ static int _parse_file(struct dm_task *dmt, const char *file)
                *ptr = '\0';
 
                /* trim leading space */
-                for (ptr = buffer; *ptr && isspace((int) *ptr); ptr++)
-                        ;
+               for (ptr = buffer; *ptr && isspace((int) *ptr); ptr++) ;
 
-                if (!*ptr || *ptr == '#')
-                        continue;
+               if (!*ptr || *ptr == '#')
+                       continue;
 
-                if (sscanf(ptr, "%llu %llu %as %n",
-                           &start, &size, &ttype, &n) < 3) {
-                        err("%s:%d Invalid format", file, line);
-                        goto out;
-                }
+               if (sscanf(ptr, "%llu %llu %as %n",
+                          &start, &size, &ttype, &n) < 3) {
+                       err("%s:%d Invalid format", file, line);
+                       goto out;
+               }
 
                ptr += n;
                if ((comment = strchr(ptr, (int) '#')))
                        *comment = '\0';
 
-                if (!dm_task_add_target(dmt, start, size, ttype, ptr))
-                        goto out;
+               if (!dm_task_add_target(dmt, start, size, ttype, ptr))
+                       goto out;
 
                free(ttype);
-        }
-        r = 1;
+       }
+       r = 1;
 
- out:
-        fclose(fp);
-        return r;
+      out:
+       fclose(fp);
+       return r;
 }
 
 static int _load(int task, const char *name, const char *file)
@@ -116,7 +114,7 @@ static int _load(int task, const char *name, const char *file)
 
        r = 1;
 
-out:
+      out:
        dm_task_destroy(dmt);
 
        return r;
@@ -137,24 +135,24 @@ static int _rename(int argc, char **argv)
        int r = 0;
        struct dm_task *dmt;
 
-        if (!(dmt = dm_task_create(DM_DEVICE_RENAME)))
-                return 0;
+       if (!(dmt = dm_task_create(DM_DEVICE_RENAME)))
+               return 0;
 
-        if (!dm_task_set_name(dmt, argv[1]))
-                goto out;
+       if (!dm_task_set_name(dmt, argv[1]))
+               goto out;
 
        if (!dm_task_set_newname(dmt, argv[2]))
                goto out;
 
-        if (!dm_task_run(dmt))
-                goto out;
+       if (!dm_task_run(dmt))
+               goto out;
 
-        r = 1;
+       r = 1;
 
-out:
-        dm_task_destroy(dmt);
+      out:
+       dm_task_destroy(dmt);
 
-        return r;
+       return r;
 }
 
 static int _version(int argc, char **argv)
@@ -172,7 +170,7 @@ static int _version(int argc, char **argv)
        if (!dm_task_run(dmt))
                goto out;
 
-       if (!dm_task_get_driver_version(dmt, (char *)&version,
+       if (!dm_task_get_driver_version(dmt, (char *) &version,
                                        sizeof(version)))
                goto out;
 
@@ -201,11 +199,16 @@ static int _simple(int task, const char *name)
 
        r = dm_task_run(dmt);
 
- out:
+      out:
        dm_task_destroy(dmt);
        return r;
 }
 
+static int _remove_all(int argc, char **argv)
+{
+       return _simple(DM_DEVICE_REMOVE_ALL, "");
+}
+
 static int _remove(int argc, char **argv)
 {
        return _simple(DM_DEVICE_REMOVE, argv[1]);
@@ -260,7 +263,7 @@ static int _info(int argc, char **argv)
 
        r = 1;
 
- out:
+      out:
        dm_task_destroy(dmt);
        return r;
 }
@@ -305,16 +308,15 @@ static int _deps(int argc, char **argv)
 
        r = 1;
 
- out:
+      out:
        dm_task_destroy(dmt);
        return r;
 }
 
-
 /*
  * dispatch table
  */
-typedef int (*command_fn)(int argc, char **argv);
+typedef int (*command_fn) (int argc, char **argv);
 
 struct command {
        char *name;
@@ -326,6 +328,7 @@ struct command {
 static struct command _commands[] = {
        {"create", "<dev_name> <table_file>", 2, _create},
        {"remove", "<dev_name>", 1, _remove},
+       {"remove_all", "", 0, _remove_all},
        {"suspend", "<dev_name>", 1, _suspend},
        {"resume", "<dev_name>", 1, _resume},
        {"reload", "<dev_name> <table_file>", 2, _reload},
@@ -336,14 +339,13 @@ static struct command _commands[] = {
        {NULL, NULL, 0, NULL}
 };
 
-static void _usage(FILE *out)
+static void _usage(FILE * out)
 {
        int i;
 
        fprintf(out, "usage:\n");
        for (i = 0; _commands[i].name; i++)
-               fprintf(out, "\t%s %s\n",
-                       _commands[i].name, _commands[i].help);
+               fprintf(out, "\t%s %s\n", _commands[i].name, _commands[i].help);
        return;
 }
 
@@ -423,4 +425,3 @@ int main(int argc, char **argv)
 
        return 0;
 }
-

diff --git a/kernel/VERSION b/kernel/VERSION
index 678a0bf982808d108df411eb158af4375fa9603c..c80a19ad87e3128f0e2e54cca999bf3680df9ae1 100644 (file)
--- a/kernel/VERSION
+++ b/kernel/VERSION
@@ -1 +1 @@
-0.94.06-cvs (2002-03-07)
+0.94.07-cvs (2002-03-07)

diff --git a/kernel/common/dm.c.in b/kernel/common/dm.c.in
index b9d0e8e0c2d885d92eb39acc339a21795624ce6a..1f9b4acf5ca9b0a86271ee7426480fabd4ad0f15 100644 (file)
--- a/kernel/common/dm.c.in
+++ b/kernel/common/dm.c.in
@@ -26,7 +26,7 @@ struct io_hook {
        struct target *target;
        int rw;
 
-       void (*end_io)(struct buffer_head *bh, int uptodate);
+       void (*end_io) (struct buffer_head * bh, int uptodate);
        void *context;
 };
 
@@ -49,7 +49,7 @@ static int _hardsect_size[MAX_DEVICES];
 
 static devfs_handle_t _dev_dir;
 
-static int request(request_queue_t *q, int rw, struct buffer_head *bh);
+static int request(request_queue_t * q, int rw, struct buffer_head *bh);
 static int dm_user_bmap(struct inode *inode, struct lv_bmap *lvb);
 
 /*
@@ -271,7 +271,6 @@ static int __init dm_init(void)
        if (r)
                goto out_mirror;
 
-
        return 0;
 
       out_mirror:
@@ -296,6 +295,7 @@ static int __init dm_init(void)
 
 static void __exit dm_exit(void)
 {
+       dm_destroy_all();
        dm_interface_exit();
        dm_stripe_exit();
        dm_linear_exit();
@@ -372,13 +372,13 @@ static int dm_blk_ioctl(struct inode *inode, struct file *file,
 
        case BLKGETSIZE:
                size = VOLUME_SIZE(minor);
-               if (copy_to_user((void *)a, &size, sizeof(long)))
+               if (copy_to_user((void *) a, &size, sizeof(long)))
                        return -EFAULT;
                break;
 
        case BLKGETSIZE64:
                size = VOLUME_SIZE(minor);
-               if (put_user((u64)size, (u64 *)a))
+               if (put_user((u64) size, (u64 *) a))
                        return -EFAULT;
                break;
 
@@ -556,7 +556,7 @@ static inline int __find_node(struct dm_table *t, struct buffer_head *bh)
        return (KEYS_PER_NODE * n) + k;
 }
 
-static int request(request_queue_t *q, int rw, struct buffer_head *bh)
+static int request(request_queue_t * q, int rw, struct buffer_head *bh)
 {
        struct mapped_device *md;
        int r, minor = MINOR(bh->b_rdev);
@@ -596,7 +596,6 @@ static int request(request_queue_t *q, int rw, struct buffer_head *bh)
                }
        }
 
-
        if ((r = __map_buffer(md, bh, rw, __find_node(md->map, bh))) < 0)
                goto bad;
 
@@ -758,7 +757,7 @@ static struct mapped_device *alloc_dev(const char *name, const char *uuid,
        md->name[sizeof(md->name) - 1] = '\0';
 
        if (*uuid) {
-               if (!(md->uuid = kmalloc(strnlen(uuid, DM_UUID_LEN), 
+               if (!(md->uuid = kmalloc(strnlen(uuid, DM_UUID_LEN),
                                         GFP_KERNEL))) {
                        DMWARN("unable to allocate uuid - out of memory.");
                        return NULL;
@@ -900,7 +899,7 @@ int dm_create(const char *name, const char *uuid,
        spin_unlock(&_create_lock);
        return 0;
 
- err:
+      err:
        _devs[minor] = NULL;
        if (md->uuid)
                kfree(md->uuid);
@@ -972,6 +971,24 @@ int dm_destroy(struct mapped_device *md)
        return 0;
 }
 
+/*
+ * Destroy all devices - except suspended ones...
+ */
+void dm_destroy_all(void)
+{
+       int i;
+       struct mapped_device *md;
+
+       for (i = 0; i < MAX_DEVICES; i++) {
+               md = dm_get_w(i);
+               if (!md)
+                       continue;
+
+               dm_destroy(md);
+               dm_put_w(i);
+       }
+}
+
 /*
  * Sets or clears the read-only flag for the device.  Write lock
  * must be held.

diff --git a/kernel/common/dm.h b/kernel/common/dm.h
index dbb7d965893d6183db15df4b15bf1809f0d9ab50..d0f8b445666bcfb1c872bc8a42f732a0dcce0245 100644 (file)
--- a/kernel/common/dm.h
+++ b/kernel/common/dm.h
@@ -130,6 +130,7 @@ void dm_put_w(int minor);
 int dm_create(const char *name, const char *uuid,
              int minor, struct dm_table *table);
 int dm_set_name(const char *oldname, const char *newname);
+void dm_destroy_all(void);
 
 /*
  * You must have the write lock before calling the remaining md

diff --git a/kernel/ioctl/dm-ioctl.c b/kernel/ioctl/dm-ioctl.c
index d680bb8da224d0a80c55a215389fcf895e930da8..92c8b1f6fbc5d61d480f1bd1af51668c73ec5a75 100644 (file)
--- a/kernel/ioctl/dm-ioctl.c
+++ b/kernel/ioctl/dm-ioctl.c
@@ -17,7 +17,7 @@ static void free_params(struct dm_ioctl *p)
 
 static int version(struct dm_ioctl *user)
 {
-        return copy_to_user(user, DM_DRIVER_VERSION, sizeof(DM_DRIVER_VERSION));
+       return copy_to_user(user, DM_DRIVER_VERSION, sizeof(DM_DRIVER_VERSION));
 }
 
 static int copy_params(struct dm_ioctl *user, struct dm_ioctl **result)
@@ -66,10 +66,10 @@ static int next_target(struct dm_target_spec *last, unsigned long next,
                       struct dm_target_spec **spec, char **params)
 {
        *spec = (struct dm_target_spec *)
-               ((unsigned char *) last + next);
+           ((unsigned char *) last + next);
        *params = (char *) (*spec + 1);
 
-       if (*spec < (last + 1) || ((void *)*spec > end))
+       if (*spec < (last + 1) || ((void *) *spec > end))
                return -EINVAL;
 
        return valid_str(*params, begin, end);
@@ -111,11 +111,10 @@ static int populate_table(struct dm_table *table, struct dm_ioctl *args)
 
        for (i = 0; i < args->target_count; i++) {
 
-               r = first ? next_target((struct dm_target_spec *)args,
+               r = first ? next_target((struct dm_target_spec *) args,
                                        args->data_start,
                                        begin, end, &spec, &params) :
-                           next_target(spec, spec->next,
-                                       begin, end, &spec, &params);
+                   next_target(spec, spec->next, begin, end, &spec, &params);
 
                if (r)
                        PARSE_ERROR("unable to find target");
@@ -135,8 +134,8 @@ static int populate_table(struct dm_table *table, struct dm_ioctl *args)
                /* Build the target */
                if (ttype->ctr(table, spec->sector_start, spec->length,
                               argc, argv, &context)) {
-                       DMWARN("%s: target constructor failed", 
-                              (char *)context);
+                       DMWARN("%s: target constructor failed",
+                              (char *) context);
                        return -EINVAL;
                }
 
@@ -240,7 +239,7 @@ static int info(struct dm_ioctl *param, struct dm_ioctl *user)
        __info(md, param);
        dm_put_r(minor);
 
- out:
+      out:
        return results_to_user(user, param, NULL, 0);
 }
 
@@ -270,7 +269,7 @@ static int dep(struct dm_ioctl *param, struct dm_ioctl *user)
         */
        count = 0;
        list_for_each(tmp, &md->map->devices)
-               count++;
+           count++;
 
        /*
         * Allocate a kernel space version of the dm_target_status
@@ -288,13 +287,13 @@ static int dep(struct dm_ioctl *param, struct dm_ioctl *user)
         */
        deps->count = count;
        count = 0;
-       list_for_each (tmp, &md->map->devices) {
+       list_for_each(tmp, &md->map->devices) {
                struct dm_dev *dd = list_entry(tmp, struct dm_dev, list);
                deps->dev[count++] = kdev_t_to_nr(dd->dev);
        }
        dm_put_r(minor);
 
- out:
+      out:
        r = results_to_user(user, param, deps, len);
 
        kfree(deps);
@@ -319,7 +318,7 @@ static int create(struct dm_ioctl *param, struct dm_ioctl *user)
        }
 
        minor = (param->flags & DM_PERSISTENT_DEV_FLAG) ?
-               MINOR(to_kdev_t(param->dev)) : -1;
+           MINOR(to_kdev_t(param->dev)) : -1;
 
        r = dm_create(param->name, param->uuid, minor, t);
        if (r) {
@@ -366,8 +365,7 @@ static int suspend(struct dm_ioctl *param)
                return -ENXIO;
 
        minor = MINOR(md->dev);
-       r = (param->flags & DM_SUSPEND_FLAG) ?
-            dm_suspend(md) : dm_resume(md);
+       r = (param->flags & DM_SUSPEND_FLAG) ? dm_suspend(md) : dm_resume(md);
        dm_put_w(minor);
 
        return r;
@@ -447,13 +445,20 @@ static int ctl_ioctl(struct inode *inode, struct file *file,
        struct dm_ioctl *p;
        uint cmd = _IOC_NR(command);
 
-       if (cmd == DM_VERSION_CMD)
+       switch (cmd) {
+       case DM_REMOVE_ALL_CMD:
+               dm_destroy_all();
+       case DM_VERSION_CMD:
                return version((struct dm_ioctl *) a);
+       default:
+               break;
+       }
 
        r = copy_params((struct dm_ioctl *) a, &p);
        if (r)
                return r;
 
+       /* FIXME: Change to use size 0 next time ioctl version gets changed */
        switch (cmd) {
        case DM_CREATE_CMD:
                r = create(p, (struct dm_ioctl *) a);
@@ -522,7 +527,7 @@ int __init dm_interface_init(void)
        r = devfs_generate_path(_dm_misc.devfs_handle, rname + 3,
                                sizeof rname - 3);
        if (r == -ENOSYS)
-               return 0;       /* devfs not present */
+               return 0;       /* devfs not present */
 
        if (r < 0) {
                DMERR("devfs_generate_path failed for control device");
@@ -531,8 +536,7 @@ int __init dm_interface_init(void)
 
        strncpy(rname + r, "../", 3);
        r = devfs_mk_symlink(NULL, DM_DIR "/control",
-                            DEVFS_FL_DEFAULT, rname + r,
-                            &_ctl_handle, NULL);
+                            DEVFS_FL_DEFAULT, rname + r, &_ctl_handle, NULL);
        if (r) {
                DMERR("devfs_mk_symlink failed for control device");
                goto failed;

diff --git a/kernel/ioctl/dm-ioctl.h.in b/kernel/ioctl/dm-ioctl.h.in
index 04fda39f351ccdab05893bf0dca9c4cd09e1ac44..ccb15b594fb8dc6689c82188314b7b9ca0914de6 100644 (file)
--- a/kernel/ioctl/dm-ioctl.h.in
+++ b/kernel/ioctl/dm-ioctl.h.in
@@ -20,11 +20,11 @@
 struct dm_ioctl {
        char version[16];
 
-       unsigned long data_size;        /* total size of data passed in */
-                                       /* including this struct */
+       unsigned long data_size;        /* total size of data passed in
+                                        * including this struct */
 
-       unsigned long data_start;       /* offset to start of data */
-                                       /* relative to start of this struct */
+       unsigned long data_start;       /* offset to start of data
+                                        * relative to start of this struct */
 
        char name[DM_NAME_LEN];         /* device name */
 
@@ -34,7 +34,7 @@ struct dm_ioctl {
 
        __kernel_dev_t dev;             /* in/out */
 
-       char uuid[DM_UUID_LEN];         /* unique identifier for
+       char uuid[DM_UUID_LEN];         /* unique identifier for
                                         * the block device */
 };
 
@@ -58,38 +58,38 @@ struct dm_target_spec {
         */
 };
 
-
 /*
  * Used to retrieve the target dependencies.
  */
 struct dm_target_deps {
        unsigned int count;
 
-       __kernel_dev_t dev[0];          /* out */
+       __kernel_dev_t dev[0];  /* out */
 };
 
-
 #define DM_IOCTL 0xfd
 
 enum {
-       DM_CREATE_CMD=0,
+       DM_CREATE_CMD = 0,
        DM_REMOVE_CMD,
        DM_SUSPEND_CMD,
        DM_RELOAD_CMD,
        DM_INFO_CMD,
        DM_RENAME_CMD,
        DM_VERSION_CMD,
-       DM_DEPS_CMD
+       DM_DEPS_CMD,
+       DM_REMOVE_ALL_CMD
 };
 
-#define DM_CREATE      _IOWR(DM_IOCTL, DM_CREATE_CMD, struct dm_ioctl)
-#define DM_REMOVE      _IOW(DM_IOCTL, DM_REMOVE_CMD, struct dm_ioctl)
-#define DM_SUSPEND     _IOW(DM_IOCTL, DM_SUSPEND_CMD, struct dm_ioctl)
-#define DM_RELOAD      _IOW(DM_IOCTL, DM_RELOAD_CMD, struct dm_ioctl)
+#define        DM_CREATE       _IOWR(DM_IOCTL, DM_CREATE_CMD, struct dm_ioctl)
+#define        DM_REMOVE       _IOW(DM_IOCTL, DM_REMOVE_CMD, struct dm_ioctl)
+#define        DM_SUSPEND      _IOW(DM_IOCTL, DM_SUSPEND_CMD, struct dm_ioctl)
+#define        DM_RELOAD       _IOW(DM_IOCTL, DM_RELOAD_CMD, struct dm_ioctl)
 #define DM_INFO                _IOWR(DM_IOCTL, DM_INFO_CMD, struct dm_ioctl)
 #define DM_RENAME      _IOW(DM_IOCTL, DM_RENAME_CMD, struct dm_ioctl)
 #define DM_VERSION     _IOR(DM_IOCTL, DM_VERSION_CMD, struct dm_ioctl)
 #define DM_DEPS                _IOR(DM_IOCTL, DM_DEPS_CMD, struct dm_ioctl)
+#define DM_REMOVE_ALL  _IOR(DM_IOCTL, DM_REMOVE_ALL_CMD, struct dm_ioctl)
 
 #define DM_IOCTL_VERSION @DM_IOCTL_VERSION@
 #define DM_DRIVER_VERSION @DM_DRIVER_VERSION@
@@ -100,4 +100,4 @@ enum {
 #define DM_EXISTS_FLAG         0x00000004
 #define DM_PERSISTENT_DEV_FLAG 0x00000008
 
-#endif /* _LINUX_DM_IOCTL_H */
+#endif                         /* _LINUX_DM_IOCTL_H */

diff --git a/lib/ioctl/libdevmapper.c b/lib/ioctl/libdevmapper.c
index 73525450c9da59fef90809e96bad1c84e4bde5f5..1d9076decd79d06d1d2fb8ea959a22087a3a15f4 100644 (file)
--- a/lib/ioctl/libdevmapper.c
+++ b/lib/ioctl/libdevmapper.c
@@ -43,8 +43,7 @@ void dm_task_destroy(struct dm_task *dmt)
        free(dmt);
 }
 
-int dm_task_get_driver_version(struct dm_task *dmt, char *version,
-                              size_t size)
+int dm_task_get_driver_version(struct dm_task *dmt, char *version, size_t size)
 {
        if (!dmt->dmi)
                return 0;
@@ -97,13 +96,12 @@ int dm_task_set_newname(struct dm_task *dmt, const char *newname)
 }
 
 struct target *create_target(uint64_t start,
-                            uint64_t len,
-                            const char *type, const char *params)
+                            uint64_t len, const char *type, const char *params)
 {
        struct target *t = malloc(sizeof(*t));
 
        if (!t) {
-                log_error("create_target: malloc(%d) failed", sizeof(*t));
+               log_error("create_target: malloc(%d) failed", sizeof(*t));
                return NULL;
        }
 
@@ -123,7 +121,7 @@ struct target *create_target(uint64_t start,
        t->length = len;
        return t;
 
- bad:
+      bad:
        free(t->params);
        free(t->type);
        free(t);
@@ -241,7 +239,7 @@ static struct dm_ioctl *_flatten(struct dm_task *dmt)
 
        return dmi;
 
- bad:
+      bad:
        free(dmi);
        return NULL;
 }
@@ -278,6 +276,10 @@ int dm_task_run(struct dm_task *dmt)
                command = DM_REMOVE;
                break;
 
+       case DM_DEVICE_REMOVE_ALL:
+               command = DM_REMOVE_ALL;
+               break;
+
        case DM_DEVICE_SUSPEND:
                command = DM_SUSPEND;
                break;
@@ -304,13 +306,13 @@ int dm_task_run(struct dm_task *dmt)
 
        default:
                log_error("Internal error: unknown device-mapper task %d",
-                   dmt->type);
+                         dmt->type);
                goto bad;
        }
 
        if (ioctl(fd, command, dmi) < 0) {
                log_error("device-mapper ioctl cmd %d failed: %s", dmt->type,
-                   strerror(errno));
+                         strerror(errno));
                goto bad;
        }
 
@@ -328,10 +330,9 @@ int dm_task_run(struct dm_task *dmt)
        close(fd);
        return 1;
 
- bad:
+      bad:
        free(dmi);
        if (fd >= 0)
                close(fd);
        return 0;
 }
-

diff --git a/lib/libdevmapper.h b/lib/libdevmapper.h
index 33beb466086bfc43aecbd9c7b2eae7cee08808b6..a47e264c23bfcccad37e9283b5359e33267d7960 100644 (file)
--- a/lib/libdevmapper.h
+++ b/lib/libdevmapper.h
@@ -20,9 +20,8 @@
  * each ioctl command you want to execute.
  */
 
-
-typedef void (*dm_log_fn)(int level, const char *file, int line,
-                         const char *f, ...);
+typedef void (*dm_log_fn) (int level, const char *file, int line,
+                          const char *f, ...);
 
 /*
  * The library user may wish to register their own
@@ -35,6 +34,7 @@ enum {
        DM_DEVICE_CREATE,
        DM_DEVICE_RELOAD,
        DM_DEVICE_REMOVE,
+       DM_DEVICE_REMOVE_ALL,
 
        DM_DEVICE_SUSPEND,
        DM_DEVICE_RESUME,
@@ -46,7 +46,6 @@ enum {
        DM_DEVICE_VERSION,
 };
 
-
 struct dm_task;
 
 struct dm_task *dm_task_create(int type);
@@ -74,8 +73,7 @@ struct dm_deps {
 };
 
 int dm_get_library_version(char *version, size_t size);
-int dm_task_get_driver_version(struct dm_task *dmt, char *version,
-                              size_t size);
+int dm_task_get_driver_version(struct dm_task *dmt, char *version, size_t size);
 int dm_task_get_info(struct dm_task *dmt, struct dm_info *dmi);
 
 struct dm_deps *dm_task_get_deps(struct dm_task *dmt);
@@ -89,9 +87,7 @@ int dm_task_set_minor(struct dm_task *dmt, int minor);
  */
 int dm_task_add_target(struct dm_task *dmt,
                       uint64_t start,
-                      uint64_t size,
-                      const char *ttype,
-                      const char *params);
+                      uint64_t size, const char *ttype, const char *params);
 
 /*
  * Call this to actually run the ioctl.
@@ -104,4 +100,4 @@ int dm_task_run(struct dm_task *dmt);
 int dm_set_dev_dir(const char *dir);
 const char *dm_dir(void);
 
-#endif /* LIB_DEVICE_MAPPER_H */
+#endif                         /* LIB_DEVICE_MAPPER_H */