Skip to content
Snippets Groups Projects
Commit a36aeade authored by Jeffle Xu's avatar Jeffle Xu Committed by Greg Kroah-Hartman
Browse files

dm table: fix DAX iterate_devices based device capability checks


commit 5b0fab50 upstream.

Fix dm_table_supports_dax() and invert logic of both
iterate_devices_callout_fn so that all devices' DAX capabilities are
properly checked.

Fixes: 545ed20e ("dm: add infrastructure for DAX support")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarJeffle Xu <jefflexu@linux.alibaba.com>
Signed-off-by: default avatarMike Snitzer <snitzer@redhat.com>
[jeffle: no dax write cache, no dax synchronous]
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 75c5d315
Branches
Tags
No related merge requests found
...@@ -848,12 +848,12 @@ void dm_table_set_type(struct dm_table *t, unsigned type) ...@@ -848,12 +848,12 @@ void dm_table_set_type(struct dm_table *t, unsigned type)
} }
EXPORT_SYMBOL_GPL(dm_table_set_type); EXPORT_SYMBOL_GPL(dm_table_set_type);
static int device_supports_dax(struct dm_target *ti, struct dm_dev *dev, static int device_not_dax_capable(struct dm_target *ti, struct dm_dev *dev,
sector_t start, sector_t len, void *data) sector_t start, sector_t len, void *data)
{ {
struct request_queue *q = bdev_get_queue(dev->bdev); struct request_queue *q = bdev_get_queue(dev->bdev);
return q && blk_queue_dax(q); return q && !blk_queue_dax(q);
} }
static bool dm_table_supports_dax(struct dm_table *t) static bool dm_table_supports_dax(struct dm_table *t)
...@@ -869,7 +869,7 @@ static bool dm_table_supports_dax(struct dm_table *t) ...@@ -869,7 +869,7 @@ static bool dm_table_supports_dax(struct dm_table *t)
return false; return false;
if (!ti->type->iterate_devices || if (!ti->type->iterate_devices ||
!ti->type->iterate_devices(ti, device_supports_dax, NULL)) ti->type->iterate_devices(ti, device_not_dax_capable, NULL))
return false; return false;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment