summaryrefslogtreecommitdiff
path: root/drivers/md/Makefile
diff options
context:
space:
mode:
authorMikulas Patocka <mpatocka@redhat.com>2014-01-14 00:37:54 (GMT)
committerMike Snitzer <snitzer@redhat.com>2014-01-15 04:23:04 (GMT)
commit2995fa78e423d7193f3b57835f6c1c75006a0315 (patch)
tree9f107c0503a3c0ba58559a62847e9236f3fd1951 /drivers/md/Makefile
parent55b082e614e219fb5199a6f93e648ed35d3c96d5 (diff)
downloadlinux-2995fa78e423d7193f3b57835f6c1c75006a0315.tar.xz
dm sysfs: fix a module unload race
This reverts commit be35f48610 ("dm: wait until embedded kobject is released before destroying a device") and provides an improved fix. The kobject release code that calls the completion must be placed in a non-module file, otherwise there is a module unload race (if the process calling dm_kobject_release is preempted and the DM module unloaded after the completion is triggered, but before dm_kobject_release returns). To fix this race, this patch moves the completion code to dm-builtin.c which is always compiled directly into the kernel if BLK_DEV_DM is selected. The patch introduces a new dm_kobject_holder structure, its purpose is to keep the completion and kobject in one place, so that it can be accessed from non-module code without the need to export the layout of struct mapped_device to that code. Signed-off-by: Mikulas Patocka <mpatocka@redhat.com> Signed-off-by: Mike Snitzer <snitzer@redhat.com> Cc: stable@vger.kernel.org
Diffstat (limited to 'drivers/md/Makefile')
-rw-r--r--drivers/md/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/md/Makefile b/drivers/md/Makefile
index 2acc43f..f26d832 100644
--- a/drivers/md/Makefile
+++ b/drivers/md/Makefile
@@ -32,6 +32,7 @@ obj-$(CONFIG_MD_FAULTY) += faulty.o
obj-$(CONFIG_BCACHE) += bcache/
obj-$(CONFIG_BLK_DEV_MD) += md-mod.o
obj-$(CONFIG_BLK_DEV_DM) += dm-mod.o
+obj-$(CONFIG_BLK_DEV_DM_BUILTIN) += dm-builtin.o
obj-$(CONFIG_DM_BUFIO) += dm-bufio.o
obj-$(CONFIG_DM_BIO_PRISON) += dm-bio-prison.o
obj-$(CONFIG_DM_CRYPT) += dm-crypt.o