Merge branch 'fix/asoc' into for-linus

[karo-tx-linux.git] / drivers / md / dm-snap.h

diff --git a/drivers/md/dm-snap.h b/drivers/md/dm-snap.h
index 6e4beaf89f6c276642581e3a2fd3f31e15574f8a..d9e62b43cf8541d9c3426213c129572ca30d3abb 100644 (file)
--- a/drivers/md/dm-snap.h
+++ b/drivers/md/dm-snap.h
@@ -61,7 +61,7 @@ struct dm_snapshot {
        spinlock_t pe_lock;
 
        /* The on disk metadata handler */
-       struct exception_store store;
+       struct dm_exception_store store;
 
        struct dm_kcopyd_client *kcopyd_client;
 
@@ -75,12 +75,6 @@ struct dm_snapshot {
        struct hlist_head tracked_chunk_hash[DM_TRACKED_CHUNK_HASH_SIZE];
 };
 
-/*
- * Used by the exception stores to load exceptions hen
- * initialising.
- */
-int dm_add_exception(struct dm_snapshot *s, chunk_t old, chunk_t new);
-
 /*
  * Return the number of sectors in the device.
  */