diff options
Diffstat (limited to 'drivers/md')
| -rw-r--r-- | drivers/md/dm-ima.c | 3 | ||||
| -rw-r--r-- | drivers/md/dm-table.c | 9 | ||||
| -rw-r--r-- | drivers/md/dm.c | 2 |
3 files changed, 5 insertions, 9 deletions
diff --git a/drivers/md/dm-ima.c b/drivers/md/dm-ima.c index 3fd69ab12a8e..2c5edfbd7711 100644 --- a/drivers/md/dm-ima.c +++ b/drivers/md/dm-ima.c @@ -136,7 +136,8 @@ static void dm_ima_measure_data(const char *event_name, const void *buf, size_t if (noio) noio_flag = memalloc_noio_save(); - ima_measure_critical_data(DM_NAME, event_name, buf, buf_len, false); + ima_measure_critical_data(DM_NAME, event_name, buf, buf_len, + false, NULL, 0); if (noio) memalloc_noio_restore(noio_flag); diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c index b03eabc1ed7c..2111daaacaba 100644 --- a/drivers/md/dm-table.c +++ b/drivers/md/dm-table.c @@ -809,14 +809,9 @@ EXPORT_SYMBOL_GPL(dm_table_set_type); int device_not_dax_capable(struct dm_target *ti, struct dm_dev *dev, sector_t start, sector_t len, void *data) { - int blocksize = *(int *) data, id; - bool rc; + int blocksize = *(int *) data; - id = dax_read_lock(); - rc = !dax_supported(dev->dax_dev, dev->bdev, blocksize, start, len); - dax_read_unlock(id); - - return rc; + return !dax_supported(dev->dax_dev, dev->bdev, blocksize, start, len); } /* Check devices support synchronous DAX */ diff --git a/drivers/md/dm.c b/drivers/md/dm.c index 84e9145b1714..a011d09cb0fa 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c @@ -654,7 +654,7 @@ static int open_table_device(struct table_device *td, dev_t dev, } td->dm_dev.bdev = bdev; - td->dm_dev.dax_dev = dax_get_by_host(bdev->bd_disk->disk_name); + td->dm_dev.dax_dev = fs_dax_get_by_bdev(bdev); return 0; } |