diff options
author | Anton Vorontsov <anton@enomsg.org> | 2013-03-25 04:06:35 +0100 |
---|---|---|
committer | Anton Vorontsov <anton@enomsg.org> | 2013-03-25 04:06:35 +0100 |
commit | 6e997bb894beef128fcfe1679e0830f97dee6dc2 (patch) | |
tree | 078d95af4d30b5e3d5b1db18de215489b26e01ce /drivers/md/dm-cache-policy.h | |
parent | s3c-adc-battery: Fix possible NULL pointer dereference (diff) | |
parent | pm2301_charger: Remove __dev* annotations (diff) | |
download | linux-6e997bb894beef128fcfe1679e0830f97dee6dc2.tar.xz linux-6e997bb894beef128fcfe1679e0830f97dee6dc2.zip |
Merge branch 'urgent'
Conflicts:
drivers/power/pm2301_charger.c
Diffstat (limited to 'drivers/md/dm-cache-policy.h')
-rw-r--r-- | drivers/md/dm-cache-policy.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/md/dm-cache-policy.h b/drivers/md/dm-cache-policy.h index f0f51b260544..558bdfdabf5f 100644 --- a/drivers/md/dm-cache-policy.h +++ b/drivers/md/dm-cache-policy.h @@ -196,6 +196,7 @@ struct dm_cache_policy { * We maintain a little register of the different policy types. */ #define CACHE_POLICY_NAME_SIZE 16 +#define CACHE_POLICY_VERSION_SIZE 3 struct dm_cache_policy_type { /* For use by the register code only. */ @@ -206,6 +207,7 @@ struct dm_cache_policy_type { * what gets passed on the target line to select your policy. */ char name[CACHE_POLICY_NAME_SIZE]; + unsigned version[CACHE_POLICY_VERSION_SIZE]; /* * Policies may store a hint for each each cache block. |