Skip to content

Commit

Permalink
dm: only initialize md->dax_dev if CONFIG_DAX_DRIVER is enabled
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Peng Wang authored and Mike Snitzer committed Apr 26, 2019
1 parent 5de719e commit 514cf4f
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions drivers/md/dm.c
Original file line number Diff line number Diff line change
Expand Up @@ -1906,7 +1906,6 @@ static void cleanup_mapped_device(struct mapped_device *md)
static struct mapped_device *alloc_dev(int minor)
{
int r, numa_node_id = dm_get_numa_node();
struct dax_device *dax_dev = NULL;
struct mapped_device *md;
void *old_md;

Expand Down Expand Up @@ -1969,11 +1968,10 @@ static struct mapped_device *alloc_dev(int minor)
sprintf(md->disk->disk_name, "dm-%d", minor);

if (IS_ENABLED(CONFIG_DAX_DRIVER)) {
dax_dev = alloc_dax(md, md->disk->disk_name, &dm_dax_ops);
if (!dax_dev)
md->dax_dev = alloc_dax(md, md->disk->disk_name, &dm_dax_ops);
if (!md->dax_dev)
goto bad;
}
md->dax_dev = dax_dev;

add_disk_no_queue_reg(md->disk);
format_dev_t(md->name, MKDEV(_major, minor));
Expand Down

0 comments on commit 514cf4f

Please sign in to comment.