Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm

* git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm: (36 commits)
  dm: set queue ordered mode
  dm: move wait queue declaration
  dm: merge pushback and deferred bio lists
  dm: allow uninterruptible wait for pending io
  dm: merge __flush_deferred_io into caller
  dm: move bio_io_error into __split_and_process_bio
  dm: rename __split_bio
  dm: remove unnecessary struct dm_wq_req
  dm: remove unnecessary work queue context field
  dm: remove unnecessary work queue type field
  dm: bio list add bio_list_add_head
  dm snapshot: persistent fix dtr cleanup
  dm snapshot: move status to exception store
  dm snapshot: move ctr parsing to exception store
  dm snapshot: use DMEMIT macro for status
  dm snapshot: remove dm_snap header
  dm snapshot: remove dm_snap header use
  dm exception store: move cow pointer
  dm exception store: move chunk_fields
  dm exception store: move dm_target pointer
  ...

1 files changed, 69 insertions, 17 deletions

diff --git a/drivers/md/dm-snap-transient.c b/drivers/md/dm-snap-transient.c
index 7f6e2e6dcb0d..cde5aa558e6d 100644
--- a/drivers/md/dm-snap-transient.c
+++ b/drivers/md/dm-snap-transient.c
@@ -6,7 +6,6 @@
  */
 
 #include "dm-exception-store.h"
-#include "dm-snap.h"
 
 #include <linux/mm.h>
 #include <linux/pagemap.h>
@@ -23,7 +22,7 @@ struct transient_c {
         sector_t next_free;
 };
 
-static void transient_destroy(struct dm_exception_store *store)
+static void transient_dtr(struct dm_exception_store *store)
 {
         kfree(store->context);
 }
@@ -39,14 +38,14 @@ static int transient_read_metadata(struct dm_exception_store *store,
 static int transient_prepare_exception(struct dm_exception_store *store,
                                        struct dm_snap_exception *e)
 {
-        struct transient_c *tc = (struct transient_c *) store->context;
-        sector_t size = get_dev_size(store->snap->cow->bdev);
+        struct transient_c *tc = store->context;
+        sector_t size = get_dev_size(store->cow->bdev);
 
-        if (size < (tc->next_free + store->snap->chunk_size))
+        if (size < (tc->next_free + store->chunk_size))
                 return -1;
 
-        e->new_chunk = sector_to_chunk(store->snap, tc->next_free);
-        tc->next_free += store->snap->chunk_size;
+        e->new_chunk = sector_to_chunk(store, tc->next_free);
+        tc->next_free += store->chunk_size;
 
         return 0;
 }
@@ -64,20 +63,14 @@ static void transient_fraction_full(struct dm_exception_store *store,
                                     sector_t *numerator, sector_t *denominator)
 {
         *numerator = ((struct transient_c *) store->context)->next_free;
-        *denominator = get_dev_size(store->snap->cow->bdev);
+        *denominator = get_dev_size(store->cow->bdev);
 }
 
-int dm_create_transient(struct dm_exception_store *store)
+static int transient_ctr(struct dm_exception_store *store,
+                         unsigned argc, char **argv)
 {
         struct transient_c *tc;
 
-        store->destroy = transient_destroy;
-        store->read_metadata = transient_read_metadata;
-        store->prepare_exception = transient_prepare_exception;
-        store->commit_exception = transient_commit_exception;
-        store->drop_snapshot = NULL;
-        store->fraction_full = transient_fraction_full;
-
         tc = kmalloc(sizeof(struct transient_c), GFP_KERNEL);
         if (!tc)
                 return -ENOMEM;
@@ -88,11 +81,70 @@ int dm_create_transient(struct dm_exception_store *store)
         return 0;
 }
 
+static unsigned transient_status(struct dm_exception_store *store,
+                                 status_type_t status, char *result,
+                                 unsigned maxlen)
+{
+        unsigned sz = 0;
+
+        switch (status) {
+        case STATUSTYPE_INFO:
+                break;
+        case STATUSTYPE_TABLE:
+                DMEMIT(" %s N %llu", store->cow->name,
+                       (unsigned long long)store->chunk_size);
+        }
+
+        return sz;
+}
+
+static struct dm_exception_store_type _transient_type = {
+        .name = "transient",
+        .module = THIS_MODULE,
+        .ctr = transient_ctr,
+        .dtr = transient_dtr,
+        .read_metadata = transient_read_metadata,
+        .prepare_exception = transient_prepare_exception,
+        .commit_exception = transient_commit_exception,
+        .fraction_full = transient_fraction_full,
+        .status = transient_status,
+};
+
+static struct dm_exception_store_type _transient_compat_type = {
+        .name = "N",
+        .module = THIS_MODULE,
+        .ctr = transient_ctr,
+        .dtr = transient_dtr,
+        .read_metadata = transient_read_metadata,
+        .prepare_exception = transient_prepare_exception,
+        .commit_exception = transient_commit_exception,
+        .fraction_full = transient_fraction_full,
+        .status = transient_status,
+};
+
 int dm_transient_snapshot_init(void)
 {
-        return 0;
+        int r;
+
+        r = dm_exception_store_type_register(&_transient_type);
+        if (r) {
+                DMWARN("Unable to register transient exception store type");
+                return r;
+        }
+
+        r = dm_exception_store_type_register(&_transient_compat_type);
+        if (r) {
+                DMWARN("Unable to register old-style transient "
+                       "exception store type");
+                dm_exception_store_type_unregister(&_transient_type);
+                return r;
+        }
+
+        return r;
 }
 
 void dm_transient_snapshot_exit(void)
 {
+        dm_exception_store_type_unregister(&_transient_type);
+        dm_exception_store_type_unregister(&_transient_compat_type);
 }