Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

dm: only initialize md->dax_dev if CONFIG_DAX_DRIVER is enabled

md->dax_dev defaults to NULL and there is no need to initialize it
if CONFIG_DAX_DRIVER is disabled.

Signed-off-by: Peng Wang <rocking@whu.edu.cn>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>

authored by

Peng Wang and committed by
Mike Snitzer
514cf4f8 5de719e3

+2 -4
+2 -4
drivers/md/dm.c
··· 1906 1906 static struct mapped_device *alloc_dev(int minor) 1907 1907 { 1908 1908 int r, numa_node_id = dm_get_numa_node(); 1909 - struct dax_device *dax_dev = NULL; 1910 1909 struct mapped_device *md; 1911 1910 void *old_md; 1912 1911 ··· 1968 1969 sprintf(md->disk->disk_name, "dm-%d", minor); 1969 1970 1970 1971 if (IS_ENABLED(CONFIG_DAX_DRIVER)) { 1971 - dax_dev = alloc_dax(md, md->disk->disk_name, &dm_dax_ops); 1972 - if (!dax_dev) 1972 + md->dax_dev = alloc_dax(md, md->disk->disk_name, &dm_dax_ops); 1973 + if (!md->dax_dev) 1973 1974 goto bad; 1974 1975 } 1975 - md->dax_dev = dax_dev; 1976 1976 1977 1977 add_disk_no_queue_reg(md->disk); 1978 1978 format_dev_t(md->name, MKDEV(_major, minor));