diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2016-09-01 12:33:46 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2016-09-01 12:33:46 -0400 |
| commit | 0cb7bf61b1e9f05027de58c80f9b46a714d24e35 (patch) | |
| tree | 41fb55cf62d07b425122f9a8b96412c0d8eb99c5 /drivers/md/dm-crypt.c | |
| parent | aa877175e7a9982233ed8f10cb4bfddd78d82741 (diff) | |
| parent | 3eab887a55424fc2c27553b7bfe32330df83f7b8 (diff) | |
Merge branch 'linus' into smp/hotplug
Apply upstream changes to avoid conflicts with pending patches.
Diffstat (limited to 'drivers/md/dm-crypt.c')
| -rw-r--r-- | drivers/md/dm-crypt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c index 4e9784b4e0ac..eedba67b0e3e 100644 --- a/drivers/md/dm-crypt.c +++ b/drivers/md/dm-crypt.c | |||
| @@ -181,7 +181,7 @@ struct crypt_config { | |||
| 181 | u8 key[0]; | 181 | u8 key[0]; |
| 182 | }; | 182 | }; |
| 183 | 183 | ||
| 184 | #define MIN_IOS 16 | 184 | #define MIN_IOS 64 |
| 185 | 185 | ||
| 186 | static void clone_init(struct dm_crypt_io *, struct bio *); | 186 | static void clone_init(struct dm_crypt_io *, struct bio *); |
| 187 | static void kcryptd_queue_crypt(struct dm_crypt_io *io); | 187 | static void kcryptd_queue_crypt(struct dm_crypt_io *io); |