Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[sfrench/cifs-2.6.git] / drivers / md / dm-snap.h

diff --git a/drivers/md/dm-snap.h b/drivers/md/dm-snap.h
index 15fa2ae6cdc2971f590a814578d06536b75b8484..650e0f1f51d8a6c312a001c8443cf3bc8064d481 100644 (file)
--- a/drivers/md/dm-snap.h
+++ b/drivers/md/dm-snap.h
@@ -30,7 +30,7 @@ typedef sector_t chunk_t;
  * An exception is used where an old chunk of data has been
  * replaced by a new one.
  */
-struct exception {
+struct dm_snap_exception {
        struct list_head hash_list;
 
        chunk_t old_chunk;
@@ -58,13 +58,13 @@ struct exception_store {
         * Find somewhere to store the next exception.
         */
        int (*prepare_exception) (struct exception_store *store,
-                                 struct exception *e);
+                                 struct dm_snap_exception *e);
 
        /*
         * Update the metadata with this exception.
         */
        void (*commit_exception) (struct exception_store *store,
-                                 struct exception *e,
+                                 struct dm_snap_exception *e,
                                  void (*callback) (void *, int success),
                                  void *callback_context);