Commit c6eda5e8 authored by Mike Snitzer's avatar Mike Snitzer

dm cache: move hook_info into common portion of per_bio_data structure

Commit c9d28d5d ("dm cache: promotion optimisation for writes")
incorrectly placed the 'hook_info' member in the writethrough-only
portion of the per_bio_data structure.

Given that the overwrite optimization may be used for writeback the
'hook_info' member must be placed above the 'cache' member of the
per_bio_data structure.  Any members above 'cache' are available from
both writeback and writethrough modes' per_bio_data structure.
Signed-off-by: default avatarMike Snitzer <snitzer@redhat.com>
Acked-by: default avatarJoe Thornber <ejt@redhat.com>
Cc: stable@vger.kernel.org # 3.13+
parent 6d0abeca
...@@ -289,6 +289,7 @@ struct per_bio_data { ...@@ -289,6 +289,7 @@ struct per_bio_data {
bool tick:1; bool tick:1;
unsigned req_nr:2; unsigned req_nr:2;
struct dm_deferred_entry *all_io_entry; struct dm_deferred_entry *all_io_entry;
struct dm_hook_info hook_info;
/* /*
* writethrough fields. These MUST remain at the end of this * writethrough fields. These MUST remain at the end of this
...@@ -297,7 +298,6 @@ struct per_bio_data { ...@@ -297,7 +298,6 @@ struct per_bio_data {
*/ */
struct cache *cache; struct cache *cache;
dm_cblock_t cblock; dm_cblock_t cblock;
struct dm_hook_info hook_info;
struct dm_bio_details bio_details; struct dm_bio_details bio_details;
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment