diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-26 21:35:01 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-26 21:35:01 +0200 |
| commit | 22165fa79814e71e7a5974b3c37a5028ed16c8f9 (patch) | |
| tree | 2dd55b3e3d21017410a0f1b1c2c0281fe4bc8e6c /drivers/md/dm.h | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 (diff) | |
| parent | dm cache policy smq: fix "default" version to be 1.4.0 (diff) | |
| download | linux-22165fa79814e71e7a5974b3c37a5028ed16c8f9.tar.xz linux-22165fa79814e71e7a5974b3c37a5028ed16c8f9.zip | |
Merge tag 'dm-4.2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm
Pull device mapper fixes from Mike Snitzer:
"Apologies for not pressing this request-based DM partial completion
issue further, it was an oversight on my part. We'll have to get it
fixed up properly and revisit for a future release.
- Revert block and DM core changes the removed request-based DM's
ability to handle partial request completions -- otherwise with the
current SCSI LLDs these changes could lead to silent data
corruption.
- Fix two DM version bumps that were missing from the initial 4.2 DM
pull request (enabled userspace lvm2 to know certain changes have
been made)"
* tag 'dm-4.2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
dm cache policy smq: fix "default" version to be 1.4.0
dm: bump the ioctl version to 4.32.0
Revert "block, dm: don't copy bios for request clones"
Revert "dm: do not allocate any mempools for blk-mq request-based DM"
Diffstat (limited to 'drivers/md/dm.h')
| -rw-r--r-- | drivers/md/dm.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/md/dm.h b/drivers/md/dm.h index 7fff744f0865..4e984993d40a 100644 --- a/drivers/md/dm.h +++ b/drivers/md/dm.h @@ -223,9 +223,8 @@ void dm_kcopyd_exit(void); /* * Mempool operations */ -struct dm_md_mempools *dm_alloc_bio_mempools(unsigned integrity, - unsigned per_bio_data_size); -struct dm_md_mempools *dm_alloc_rq_mempools(struct mapped_device *md, unsigned type); +struct dm_md_mempools *dm_alloc_md_mempools(struct mapped_device *md, unsigned type, + unsigned integrity, unsigned per_bio_data_size); void dm_free_md_mempools(struct dm_md_mempools *pools); /* |