diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-25 12:33:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-25 12:33:49 -0700 |
| commit | 6f97b220f414e3599ea5374905ba6d0dc47d63b0 (patch) | |
| tree | 79b268ea6efcd417d923fdbc1aed7bc0fce15554 /drivers/md/dm-snap.h | |
| parent | 4b7227ca321ccf447cdc04538687c895db8b77f5 (diff) | |
| parent | e3dcc5a387fc38e9c3c6c4f857cd9a7f71a8553a (diff) | |
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: (24 commits)
dm crypt: add documentation
dm: remove md argument from specific_minor
dm table: remove unused dm_create_error_table
dm table: drop void suspend_targets return
dm: unplug queues in threads
dm raid1: use timer
dm: move include files
dm kcopyd: rename
dm: expose macros
dm kcopyd: remove redundant client counting
dm kcopyd: private mempool
dm kcopyd: per device
dm log: make module use tracking internal
dm log: move register functions
dm log: clean interface
dm kcopyd: clean interface
dm io: clean interface
dm io: rename error to error_bits
dm snapshot: store pointer to target instance
dm log: move dirty region log code into separate module
...
Diffstat (limited to 'drivers/md/dm-snap.h')
| -rw-r--r-- | drivers/md/dm-snap.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/md/dm-snap.h b/drivers/md/dm-snap.h index 93bce5d4974..24f9fb73b98 100644 --- a/drivers/md/dm-snap.h +++ b/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; @@ -169,7 +169,7 @@ struct dm_snapshot { /* The on disk metadata handler */ struct exception_store store; - struct kcopyd_client *kcopyd_client; + struct dm_kcopyd_client *kcopyd_client; /* Queue of snapshot writes for ksnapd to flush */ struct bio_list queued_bios; |