Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 93193
b: refs/heads/master
c: 72727ba
h: refs/heads/master
i:
  93191: 71e8cff
v: v3
  • Loading branch information
Mikulas Patocka authored and Alasdair G Kergon committed Apr 25, 2008
1 parent 05c51ff commit 2f4f0b4
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 769aef30f0f505c44bbe9fcd2c911a052a386139
refs/heads/master: 72727bad544b4ce0a3f7853bfd7ae939f398007d
6 changes: 3 additions & 3 deletions trunk/drivers/md/dm-snap.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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;

/*
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/md/dm-snap.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 2f4f0b4

Please sign in to comment.