diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-23 09:50:12 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-23 09:50:12 -0700 |
| commit | 3e5cce627cfaa35410ab77c50641c52b7096d3b5 (patch) | |
| tree | 74d039845f6d532a5d7f9623c92469944809a19f /drivers/md/dm-snap.h | |
| parent | f2e4bd2b37bf072babc6a1f6c2a7ef53b7b046ad (diff) | |
| parent | 51157b4ab47e1376c2b93cb854b14b637efeaff2 (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:
dm: tidy local_init
dm: remove unused flush_all
dm raid1: separate region_hash interface part1
dm: mark split bio as cloned
dm crypt: remove waitqueue
dm crypt: fix async split
dm crypt: tidy sector
dm: remove dm header from targets
dm: publish array_too_big
dm exception store: fix misordered writes
dm exception store: refactor zero_area
dm snapshot: drop unused last_percent
dm snapshot: fix primary_pe race
dm kcopyd: avoid queue shuffle
Diffstat (limited to 'drivers/md/dm-snap.h')
| -rw-r--r-- | drivers/md/dm-snap.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/md/dm-snap.h b/drivers/md/dm-snap.h index 292c15609ae..f07315fe236 100644 --- a/drivers/md/dm-snap.h +++ b/drivers/md/dm-snap.h @@ -9,7 +9,7 @@ #ifndef DM_SNAPSHOT_H #define DM_SNAPSHOT_H -#include "dm.h" +#include <linux/device-mapper.h> #include "dm-bio-list.h" #include <linux/blkdev.h> #include <linux/workqueue.h> @@ -158,9 +158,6 @@ struct dm_snapshot { /* Used for display of table */ char type; - /* The last percentage we notified */ - int last_percent; - mempool_t *pending_pool; struct exception_table pending; |