diff options
Diffstat (limited to 'drivers/md/dm-exception-store.c')
-rw-r--r-- | drivers/md/dm-exception-store.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/drivers/md/dm-exception-store.c b/drivers/md/dm-exception-store.c index 07e0a0c84f6e..cb05b744deaa 100644 --- a/drivers/md/dm-exception-store.c +++ b/drivers/md/dm-exception-store.c | |||
@@ -127,7 +127,7 @@ struct pstore { | |||
127 | struct dm_io_client *io_client; | 127 | struct dm_io_client *io_client; |
128 | }; | 128 | }; |
129 | 129 | ||
130 | static inline unsigned int sectors_to_pages(unsigned int sectors) | 130 | static unsigned sectors_to_pages(unsigned sectors) |
131 | { | 131 | { |
132 | return sectors / (PAGE_SIZE >> 9); | 132 | return sectors / (PAGE_SIZE >> 9); |
133 | } | 133 | } |
@@ -393,7 +393,7 @@ static int read_exceptions(struct pstore *ps) | |||
393 | return 0; | 393 | return 0; |
394 | } | 394 | } |
395 | 395 | ||
396 | static inline struct pstore *get_info(struct exception_store *store) | 396 | static struct pstore *get_info(struct exception_store *store) |
397 | { | 397 | { |
398 | return (struct pstore *) store->context; | 398 | return (struct pstore *) store->context; |
399 | } | 399 | } |
@@ -480,7 +480,7 @@ static int persistent_read_metadata(struct exception_store *store) | |||
480 | } | 480 | } |
481 | 481 | ||
482 | static int persistent_prepare(struct exception_store *store, | 482 | static int persistent_prepare(struct exception_store *store, |
483 | struct exception *e) | 483 | struct dm_snap_exception *e) |
484 | { | 484 | { |
485 | struct pstore *ps = get_info(store); | 485 | struct pstore *ps = get_info(store); |
486 | uint32_t stride; | 486 | uint32_t stride; |
@@ -505,7 +505,7 @@ static int persistent_prepare(struct exception_store *store, | |||
505 | } | 505 | } |
506 | 506 | ||
507 | static void persistent_commit(struct exception_store *store, | 507 | static void persistent_commit(struct exception_store *store, |
508 | struct exception *e, | 508 | struct dm_snap_exception *e, |
509 | void (*callback) (void *, int success), | 509 | void (*callback) (void *, int success), |
510 | void *callback_context) | 510 | void *callback_context) |
511 | { | 511 | { |
@@ -616,7 +616,8 @@ static int transient_read_metadata(struct exception_store *store) | |||
616 | return 0; | 616 | return 0; |
617 | } | 617 | } |
618 | 618 | ||
619 | static int transient_prepare(struct exception_store *store, struct exception *e) | 619 | static int transient_prepare(struct exception_store *store, |
620 | struct dm_snap_exception *e) | ||
620 | { | 621 | { |
621 | struct transient_c *tc = (struct transient_c *) store->context; | 622 | struct transient_c *tc = (struct transient_c *) store->context; |
622 | sector_t size = get_dev_size(store->snap->cow->bdev); | 623 | sector_t size = get_dev_size(store->snap->cow->bdev); |
@@ -631,9 +632,9 @@ static int transient_prepare(struct exception_store *store, struct exception *e) | |||
631 | } | 632 | } |
632 | 633 | ||
633 | static void transient_commit(struct exception_store *store, | 634 | static void transient_commit(struct exception_store *store, |
634 | struct exception *e, | 635 | struct dm_snap_exception *e, |
635 | void (*callback) (void *, int success), | 636 | void (*callback) (void *, int success), |
636 | void *callback_context) | 637 | void *callback_context) |
637 | { | 638 | { |
638 | /* Just succeed */ | 639 | /* Just succeed */ |
639 | callback(callback_context, 1); | 640 | callback(callback_context, 1); |