Merge tag 'for-4.18/dm-changes-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm

Pull device mapper updates from Mike Snitzer:

 - Adjust various DM structure members to improve alignment relative to
   4.18 block's mempool_t and bioset changes.

 - Add DM writecache target that offers writeback caching to persistent
   memory or SSD.

 - Small DM core error message change to give context for why a DM table
   type transition wasn't allowed.

* tag 'for-4.18/dm-changes-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
  dm: add writecache target
  dm: adjust structure members to improve alignment
  dm: report which conflicting type caused error during table_load()

1 files changed, 13 insertions, 13 deletions

diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c
index da02f4d8e4b9..4939fbc34ff2 100644
--- a/drivers/md/dm-crypt.c
+++ b/drivers/md/dm-crypt.c
@@ -139,25 +139,13 @@ struct crypt_config {
         struct dm_dev *dev;
         sector_t start;
 
-        /*
-         * pool for per bio private data, crypto requests,
-         * encryption requeusts/buffer pages and integrity tags
-         */
-        mempool_t req_pool;
-        mempool_t page_pool;
-        mempool_t tag_pool;
-        unsigned tag_pool_max_sectors;
-
         struct percpu_counter n_allocated_pages;
 
-        struct bio_set bs;
-        struct mutex bio_alloc_lock;
-
         struct workqueue_struct *io_queue;
         struct workqueue_struct *crypt_queue;
 
-        struct task_struct *write_thread;
         wait_queue_head_t write_thread_wait;
+        struct task_struct *write_thread;
         struct rb_root write_tree;
 
         char *cipher;
@@ -213,6 +201,18 @@ struct crypt_config {
         unsigned int integrity_iv_size;
         unsigned int on_disk_tag_size;
 
+        /*
+         * pool for per bio private data, crypto requests,
+         * encryption requeusts/buffer pages and integrity tags
+         */
+        unsigned tag_pool_max_sectors;
+        mempool_t tag_pool;
+        mempool_t req_pool;
+        mempool_t page_pool;
+
+        struct bio_set bs;
+        struct mutex bio_alloc_lock;
+
         u8 *authenc_key; /* space for keys in authenc() format (if used) */
         u8 key[0];
 };