Skip to content

Commit

Permalink
dm table: fix various whitespace issues with recent DAX code
Browse files Browse the repository at this point in the history
Also, rename device_synchronous to device_dax_synchronous.

Signed-off-by: Mike Snitzer <[email protected]>
  • Loading branch information
snitm committed Jul 30, 2019
1 parent 5348deb commit 9c50a98
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions drivers/md/dm-table.c
Original file line number Diff line number Diff line change
Expand Up @@ -882,23 +882,23 @@ EXPORT_SYMBOL_GPL(dm_table_set_type);

/* validate the dax capability of the target device span */
int device_supports_dax(struct dm_target *ti, struct dm_dev *dev,
sector_t start, sector_t len, void *data)
sector_t start, sector_t len, void *data)
{
int blocksize = *(int *) data;

return generic_fsdax_supported(dev->dax_dev, dev->bdev, blocksize,
start, len);
start, len);
}

/* Check devices support synchronous DAX */
static int device_synchronous(struct dm_target *ti, struct dm_dev *dev,
sector_t start, sector_t len, void *data)
static int device_dax_synchronous(struct dm_target *ti, struct dm_dev *dev,
sector_t start, sector_t len, void *data)
{
return dev->dax_dev && dax_synchronous(dev->dax_dev);
}

bool dm_table_supports_dax(struct dm_table *t,
iterate_devices_callout_fn iterate_fn, int *blocksize)
iterate_devices_callout_fn iterate_fn, int *blocksize)
{
struct dm_target *ti;
unsigned i;
Expand All @@ -911,7 +911,7 @@ bool dm_table_supports_dax(struct dm_table *t,
return false;

if (!ti->type->iterate_devices ||
!ti->type->iterate_devices(ti, iterate_fn, blocksize))
!ti->type->iterate_devices(ti, iterate_fn, blocksize))
return false;
}

Expand Down Expand Up @@ -1921,7 +1921,7 @@ void dm_table_set_restrictions(struct dm_table *t, struct request_queue *q,

if (dm_table_supports_dax(t, device_supports_dax, &page_size)) {
blk_queue_flag_set(QUEUE_FLAG_DAX, q);
if (dm_table_supports_dax(t, device_synchronous, NULL))
if (dm_table_supports_dax(t, device_dax_synchronous, NULL))
set_dax_synchronous(t->md->dax_dev);
}
else
Expand Down

0 comments on commit 9c50a98

Please sign in to comment.