Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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()

+8 -8
+8 -8
drivers/md/dm-table.c
··· 882 882 883 883 /* validate the dax capability of the target device span */ 884 884 int device_supports_dax(struct dm_target *ti, struct dm_dev *dev, 885 - sector_t start, sector_t len, void *data) 885 + sector_t start, sector_t len, void *data) 886 886 { 887 887 int blocksize = *(int *) data; 888 888 889 889 return generic_fsdax_supported(dev->dax_dev, dev->bdev, blocksize, 890 - start, len); 890 + start, len); 891 891 } 892 892 893 893 /* Check devices support synchronous DAX */ 894 - static int device_synchronous(struct dm_target *ti, struct dm_dev *dev, 895 - sector_t start, sector_t len, void *data) 894 + static int device_dax_synchronous(struct dm_target *ti, struct dm_dev *dev, 895 + sector_t start, sector_t len, void *data) 896 896 { 897 - return dax_synchronous(dev->dax_dev); 897 + return dev->dax_dev && dax_synchronous(dev->dax_dev); 898 898 } 899 899 900 900 bool dm_table_supports_dax(struct dm_table *t, 901 - iterate_devices_callout_fn iterate_fn, int *blocksize) 901 + iterate_devices_callout_fn iterate_fn, int *blocksize) 902 902 { 903 903 struct dm_target *ti; 904 904 unsigned i; ··· 911 911 return false; 912 912 913 913 if (!ti->type->iterate_devices || 914 - !ti->type->iterate_devices(ti, iterate_fn, blocksize)) 914 + !ti->type->iterate_devices(ti, iterate_fn, blocksize)) 915 915 return false; 916 916 } 917 917 ··· 1921 1921 1922 1922 if (dm_table_supports_dax(t, device_supports_dax, &page_size)) { 1923 1923 blk_queue_flag_set(QUEUE_FLAG_DAX, q); 1924 - if (dm_table_supports_dax(t, device_synchronous, NULL)) 1924 + if (dm_table_supports_dax(t, device_dax_synchronous, NULL)) 1925 1925 set_dax_synchronous(t->md->dax_dev); 1926 1926 } 1927 1927 else