From 2f4f0b4eb566c0facefeb5efb520fd5f4e05d144 Mon Sep 17 00:00:00 2001 From: Mikulas Patocka Date: Thu, 24 Apr 2008 21:43:11 +0100 Subject: [PATCH] --- yaml --- r: 93193 b: refs/heads/master c: 72727bad544b4ce0a3f7853bfd7ae939f398007d h: refs/heads/master i: 93191: 71e8cff84731454548753d41578db9c6590147ee v: v3 --- [refs] | 2 +- trunk/drivers/md/dm-snap.c | 6 +++--- trunk/drivers/md/dm-snap.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 7b22e7c3a217..c8c7cc42a5a6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 769aef30f0f505c44bbe9fcd2c911a052a386139 +refs/heads/master: 72727bad544b4ce0a3f7853bfd7ae939f398007d diff --git a/trunk/drivers/md/dm-snap.c b/trunk/drivers/md/dm-snap.c index 08047fb1cac9..08a8cbddb60d 100644 --- a/trunk/drivers/md/dm-snap.c +++ b/trunk/drivers/md/dm-snap.c @@ -536,7 +536,7 @@ static int snapshot_ctr(struct dm_target *ti, unsigned int argc, char **argv) s->last_percent = 0; init_rwsem(&s->lock); spin_lock_init(&s->pe_lock); - s->table = ti->table; + s->ti = ti; /* Allocate hash table for COW data */ if (init_hash_tables(s)) { @@ -699,7 +699,7 @@ static void __invalidate_snapshot(struct dm_snapshot *s, int err) s->valid = 0; - dm_table_event(s->table); + dm_table_event(s->ti->table); } static void get_pending_exception(struct dm_snap_pending_exception *pe) @@ -1060,7 +1060,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->table)) + if (bio->bi_sector >= dm_table_get_size(snap->ti->table)) goto next_snapshot; /* diff --git a/trunk/drivers/md/dm-snap.h b/trunk/drivers/md/dm-snap.h index 93bce5d49742..434d1dbe6bce 100644 --- a/trunk/drivers/md/dm-snap.h +++ b/trunk/drivers/md/dm-snap.h @@ -132,7 +132,7 @@ struct exception_store { struct dm_snapshot { struct rw_semaphore lock; - struct dm_table *table; + struct dm_target *ti; struct dm_dev *origin; struct dm_dev *cow;