diff options
author | Jon Brassow <jbrassow@redhat.com> | 2009-12-10 18:52:10 -0500 |
---|---|---|
committer | Alasdair G Kergon <agk@redhat.com> | 2009-12-10 18:52:10 -0500 |
commit | 1d4989c858093bda0426be536fc7f9c415857836 (patch) | |
tree | f3d831048cb65b39d5fb89178d2a6de599518a2b /drivers/md/dm-exception-store.h | |
parent | d32a6ea65fbc33621f9c790da3dff10201640b2a (diff) |
dm snapshot: rename dm_snap_exception to dm_exception
The exception structure is not necessarily just a snapshot
element (especially after we pull it out of dm-snap.c).
Renaming appropriately.
Signed-off-by: Jonathan Brassow <jbrassow@redhat.com>
Reviewed-by: Mike Snitzer <snitzer@redhat.com>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>
Diffstat (limited to 'drivers/md/dm-exception-store.h')
-rw-r--r-- | drivers/md/dm-exception-store.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/md/dm-exception-store.h b/drivers/md/dm-exception-store.h index 5f9315b32a42..92749696e359 100644 --- a/drivers/md/dm-exception-store.h +++ b/drivers/md/dm-exception-store.h | |||
@@ -26,7 +26,7 @@ typedef sector_t chunk_t; | |||
26 | * of chunks that follow contiguously. Remaining bits hold the number of the | 26 | * of chunks that follow contiguously. Remaining bits hold the number of the |
27 | * chunk within the device. | 27 | * chunk within the device. |
28 | */ | 28 | */ |
29 | struct dm_snap_exception { | 29 | struct dm_exception { |
30 | struct list_head hash_list; | 30 | struct list_head hash_list; |
31 | 31 | ||
32 | chunk_t old_chunk; | 32 | chunk_t old_chunk; |
@@ -64,13 +64,13 @@ struct dm_exception_store_type { | |||
64 | * Find somewhere to store the next exception. | 64 | * Find somewhere to store the next exception. |
65 | */ | 65 | */ |
66 | int (*prepare_exception) (struct dm_exception_store *store, | 66 | int (*prepare_exception) (struct dm_exception_store *store, |
67 | struct dm_snap_exception *e); | 67 | struct dm_exception *e); |
68 | 68 | ||
69 | /* | 69 | /* |
70 | * Update the metadata with this exception. | 70 | * Update the metadata with this exception. |
71 | */ | 71 | */ |
72 | void (*commit_exception) (struct dm_exception_store *store, | 72 | void (*commit_exception) (struct dm_exception_store *store, |
73 | struct dm_snap_exception *e, | 73 | struct dm_exception *e, |
74 | void (*callback) (void *, int success), | 74 | void (*callback) (void *, int success), |
75 | void *callback_context); | 75 | void *callback_context); |
76 | 76 | ||
@@ -120,12 +120,12 @@ static inline chunk_t dm_chunk_number(chunk_t chunk) | |||
120 | return chunk & (chunk_t)((1ULL << DM_CHUNK_NUMBER_BITS) - 1ULL); | 120 | return chunk & (chunk_t)((1ULL << DM_CHUNK_NUMBER_BITS) - 1ULL); |
121 | } | 121 | } |
122 | 122 | ||
123 | static inline unsigned dm_consecutive_chunk_count(struct dm_snap_exception *e) | 123 | static inline unsigned dm_consecutive_chunk_count(struct dm_exception *e) |
124 | { | 124 | { |
125 | return e->new_chunk >> DM_CHUNK_NUMBER_BITS; | 125 | return e->new_chunk >> DM_CHUNK_NUMBER_BITS; |
126 | } | 126 | } |
127 | 127 | ||
128 | static inline void dm_consecutive_chunk_count_inc(struct dm_snap_exception *e) | 128 | static inline void dm_consecutive_chunk_count_inc(struct dm_exception *e) |
129 | { | 129 | { |
130 | e->new_chunk += (1ULL << DM_CHUNK_NUMBER_BITS); | 130 | e->new_chunk += (1ULL << DM_CHUNK_NUMBER_BITS); |
131 | 131 | ||
@@ -140,12 +140,12 @@ static inline chunk_t dm_chunk_number(chunk_t chunk) | |||
140 | return chunk; | 140 | return chunk; |
141 | } | 141 | } |
142 | 142 | ||
143 | static inline unsigned dm_consecutive_chunk_count(struct dm_snap_exception *e) | 143 | static inline unsigned dm_consecutive_chunk_count(struct dm_exception *e) |
144 | { | 144 | { |
145 | return 0; | 145 | return 0; |
146 | } | 146 | } |
147 | 147 | ||
148 | static inline void dm_consecutive_chunk_count_inc(struct dm_snap_exception *e) | 148 | static inline void dm_consecutive_chunk_count_inc(struct dm_exception *e) |
149 | { | 149 | { |
150 | } | 150 | } |
151 | 151 | ||