Skip to content

Commit 79c63ee

Browse files
committed
Merge tag 'dm-3.7-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-dm
Pull device-mapper changes from Alasdair G Kergon: "Remove the power-of-2 block size constraint on discards in dm thin provisioning and factor the bio_prison code out into a separate module (for sharing with the forthcoming cache target). Use struct bio's front_pad to eliminate the use of one separate mempool by bio-based devices. A few other tiny clean-ups." * tag 'dm-3.7-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-dm: dm: store dm_target_io in bio front_pad dm thin: move bio_prison code to separate module dm thin: prepare to separate bio_prison code dm thin: support discard with non power of two block size dm persistent data: convert to use le32_add_cpu dm: use ACCESS_ONCE for sysfs values dm bufio: use list_move dm mpath: fix check for null mpio in end_io fn
2 parents 6a5a3d6 + dba1416 commit 79c63ee

File tree

10 files changed

+636
-511
lines changed

10 files changed

+636
-511
lines changed

drivers/md/Kconfig

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,13 @@ config DM_BUFIO
216216
as a cache, holding recently-read blocks in memory and performing
217217
delayed writes.
218218

219+
config DM_BIO_PRISON
220+
tristate
221+
depends on BLK_DEV_DM && EXPERIMENTAL
222+
---help---
223+
Some bio locking schemes used by other device-mapper targets
224+
including thin provisioning.
225+
219226
source "drivers/md/persistent-data/Kconfig"
220227

221228
config DM_CRYPT
@@ -247,6 +254,7 @@ config DM_THIN_PROVISIONING
247254
tristate "Thin provisioning target (EXPERIMENTAL)"
248255
depends on BLK_DEV_DM && EXPERIMENTAL
249256
select DM_PERSISTENT_DATA
257+
select DM_BIO_PRISON
250258
---help---
251259
Provides thin provisioning and snapshots that share a data store.
252260

drivers/md/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ obj-$(CONFIG_MD_FAULTY) += faulty.o
2929
obj-$(CONFIG_BLK_DEV_MD) += md-mod.o
3030
obj-$(CONFIG_BLK_DEV_DM) += dm-mod.o
3131
obj-$(CONFIG_DM_BUFIO) += dm-bufio.o
32+
obj-$(CONFIG_DM_BIO_PRISON) += dm-bio-prison.o
3233
obj-$(CONFIG_DM_CRYPT) += dm-crypt.o
3334
obj-$(CONFIG_DM_DELAY) += dm-delay.o
3435
obj-$(CONFIG_DM_FLAKEY) += dm-flakey.o

0 commit comments

Comments
 (0)