dm exception store: move dm_target pointer

Move target pointer from snapshot to exception store.

Signed-off-by: Jonathan Brassow <jbrassow@redhat.com>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>

diff --git a/drivers/md/dm-exception-store.c b/drivers/md/dm-exception-store.c
index 8912a3637caec4463bf1cae90f79d9a7eda79bd3..fe0cfa6771396ae2d6a67388b1a34a5981d77cb9 100644 (file)
--- a/drivers/md/dm-exception-store.c
+++ b/drivers/md/dm-exception-store.c
@@ -137,7 +137,7 @@ int dm_exception_store_type_unregister(struct dm_exception_store_type *type)
 }
 EXPORT_SYMBOL(dm_exception_store_type_unregister);
 
-int dm_exception_store_create(const char *type_name,
+int dm_exception_store_create(const char *type_name, struct dm_target *ti,
                              struct dm_exception_store **store)
 {
        int r = 0;
@@ -155,6 +155,7 @@ int dm_exception_store_create(const char *type_name,
        }
 
        tmp_store->type = type;
+       tmp_store->ti = ti;
 
        r = type->ctr(tmp_store, 0, NULL);
        if (r) {

diff --git a/drivers/md/dm-exception-store.h b/drivers/md/dm-exception-store.h
index 31377150080e8d5468c5b20023005f86023727da..4b7f7d441f5fafc59f0b9ce4de5e46531efba2f0 100644 (file)
--- a/drivers/md/dm-exception-store.h
+++ b/drivers/md/dm-exception-store.h
@@ -95,6 +95,7 @@ struct dm_exception_store_type {
 
 struct dm_exception_store {
        struct dm_exception_store_type *type;
+       struct dm_target *ti;
 
        struct dm_snapshot *snap;
 
@@ -147,7 +148,7 @@ static inline void dm_consecutive_chunk_count_inc(struct dm_snap_exception *e)
 int dm_exception_store_type_register(struct dm_exception_store_type *type);
 int dm_exception_store_type_unregister(struct dm_exception_store_type *type);
 
-int dm_exception_store_create(const char *type_name,
+int dm_exception_store_create(const char *type_name, struct dm_target *ti,
                              struct dm_exception_store **store);
 void dm_exception_store_destroy(struct dm_exception_store *store);
 

diff --git a/drivers/md/dm-snap.c b/drivers/md/dm-snap.c
index be698f3a4ae46e6e655945f9084a9311f4207434..4429c2a1d6fbf07a6a2530ac81c62183fe49821f 100644 (file)
--- a/drivers/md/dm-snap.c
+++ b/drivers/md/dm-snap.c
@@ -615,7 +615,6 @@ static int snapshot_ctr(struct dm_target *ti, unsigned int argc, char **argv)
        atomic_set(&s->pending_exceptions_count, 0);
        init_rwsem(&s->lock);
        spin_lock_init(&s->pe_lock);
-       s->ti = ti;
 
        /* Allocate hash table for COW data */
        if (init_hash_tables(s)) {
@@ -624,7 +623,7 @@ static int snapshot_ctr(struct dm_target *ti, unsigned int argc, char **argv)
                goto bad3;
        }
 
-       r = dm_exception_store_create(argv[2], &s->store);
+       r = dm_exception_store_create(argv[2], ti, &s->store);
        if (r) {
                ti->error = "Couldn't create exception store";
                r = -EINVAL;
@@ -820,7 +819,7 @@ static void __invalidate_snapshot(struct dm_snapshot *s, int err)
 
        s->valid = 0;
 
-       dm_table_event(s->ti->table);
+       dm_table_event(s->store->ti->table);
 }
 
 static void get_pending_exception(struct dm_snap_pending_exception *pe)
@@ -1196,7 +1195,7 @@ static int __origin_write(struct list_head *snapshots, struct bio *bio)
                        goto next_snapshot;
 
                /* Nothing to do if writing beyond end of snapshot */
-               if (bio->bi_sector >= dm_table_get_size(snap->ti->table))
+               if (bio->bi_sector >= dm_table_get_size(snap->store->ti->table))
                        goto next_snapshot;
 
                /*

diff --git a/drivers/md/dm-snap.h b/drivers/md/dm-snap.h
index 627be0f52c32d42c9b8aecca59f6f821885f6633..93cd8ee8997f43fb5709d70160a30fa17e6e2e8c 100644 (file)
--- a/drivers/md/dm-snap.h
+++ b/drivers/md/dm-snap.h
@@ -25,7 +25,6 @@ struct exception_table {
 
 struct dm_snapshot {
        struct rw_semaphore lock;
-       struct dm_target *ti;
 
        struct dm_dev *origin;
        struct dm_dev *cow;