aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Snitzer <snitzer@redhat.com>2018-04-30 16:06:28 -0400
committerMike Snitzer <snitzer@redhat.com>2018-04-30 17:05:17 -0400
commit3d97c829edd43262e7e9d720fa82c2241ba685a3 (patch)
treea545d1fca71f81e2545b93298a04517772544af9
parent280884fadc5bd81628da3f158ae6821ea7386432 (diff)
dm: fix some sparse warnings and whitespace in dax methods
Eliminate these sparse warnings: drivers/md/dm.c:1062:9: warning: context imbalance in 'dm_dax_direct_access' - unexpected unlock drivers/md/dm.c:1086:9: warning: context imbalance in 'dm_dax_copy_from_iter' - unexpected unlock Signed-off-by: Mike Snitzer <snitzer@redhat.com>
-rw-r--r--drivers/md/dm.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index 4ea404dbcf0b..0a7b0107ca78 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -1020,7 +1020,8 @@ int dm_set_target_max_io_len(struct dm_target *ti, sector_t len)
1020EXPORT_SYMBOL_GPL(dm_set_target_max_io_len); 1020EXPORT_SYMBOL_GPL(dm_set_target_max_io_len);
1021 1021
1022static struct dm_target *dm_dax_get_live_target(struct mapped_device *md, 1022static struct dm_target *dm_dax_get_live_target(struct mapped_device *md,
1023 sector_t sector, int *srcu_idx) 1023 sector_t sector, int *srcu_idx)
1024 __acquires(md->io_barrier)
1024{ 1025{
1025 struct dm_table *map; 1026 struct dm_table *map;
1026 struct dm_target *ti; 1027 struct dm_target *ti;
@@ -1037,7 +1038,7 @@ static struct dm_target *dm_dax_get_live_target(struct mapped_device *md,
1037} 1038}
1038 1039
1039static long dm_dax_direct_access(struct dax_device *dax_dev, pgoff_t pgoff, 1040static long dm_dax_direct_access(struct dax_device *dax_dev, pgoff_t pgoff,
1040 long nr_pages, void **kaddr, pfn_t *pfn) 1041 long nr_pages, void **kaddr, pfn_t *pfn)
1041{ 1042{
1042 struct mapped_device *md = dax_get_private(dax_dev); 1043 struct mapped_device *md = dax_get_private(dax_dev);
1043 sector_t sector = pgoff * PAGE_SECTORS; 1044 sector_t sector = pgoff * PAGE_SECTORS;
@@ -1065,7 +1066,7 @@ static long dm_dax_direct_access(struct dax_device *dax_dev, pgoff_t pgoff,
1065} 1066}
1066 1067
1067static size_t dm_dax_copy_from_iter(struct dax_device *dax_dev, pgoff_t pgoff, 1068static size_t dm_dax_copy_from_iter(struct dax_device *dax_dev, pgoff_t pgoff,
1068 void *addr, size_t bytes, struct iov_iter *i) 1069 void *addr, size_t bytes, struct iov_iter *i)
1069{ 1070{
1070 struct mapped_device *md = dax_get_private(dax_dev); 1071 struct mapped_device *md = dax_get_private(dax_dev);
1071 sector_t sector = pgoff * PAGE_SECTORS; 1072 sector_t sector = pgoff * PAGE_SECTORS;