Commit b2c74237 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-5.3/dm-fixes-1' of... 

Merge tag 'for-5.3/dm-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm

Pull device mapper fixes from Mike Snitzer:
 "Fix NULL pointer and various whitespace issues with DM's recent DAX
  code changes from commit in 5.3 merge"

* tag 'for-5.3/dm-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
  dm table: fix various whitespace issues with recent DAX code
  dm table: fix dax_dev NULL dereference in device_synchronous()
parents b07042ca 9c50a98f

drivers/md/dm-table.c

+8 −8
Original line number Diff line number Diff line
@@ -891,10 +891,10 @@ int device_supports_dax(struct dm_target *ti, struct dm_dev *dev, 
}



/* Check devices support synchronous DAX */

static int device_synchronous(struct dm_target *ti, struct dm_dev *dev,

static int device_dax_synchronous(struct dm_target *ti, struct dm_dev *dev,

				  sector_t start, sector_t len, void *data)

{

	return dax_synchronous(dev->dax_dev);

	return dev->dax_dev && dax_synchronous(dev->dax_dev);

}



bool dm_table_supports_dax(struct dm_table *t,
@@ -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