dm: fix some sparse warnings and whitespace in dax methods

snitm · snitm · commit 3d97c829edd4 · 2018-04-30T17:05:17.000-04:00
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 &lt;snitzer@redhat.com&gt;
diff --git 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)
 EXPORT_SYMBOL_GPL(dm_set_target_max_io_len);
 
 static struct dm_target *dm_dax_get_live_target(struct mapped_device *md,
-		sector_t sector, int *srcu_idx)
+						sector_t sector, int *srcu_idx)
+	__acquires(md->io_barrier)
 {
 	struct dm_table *map;
 	struct dm_target *ti;
@@ -1037,7 +1038,7 @@ static struct dm_target *dm_dax_get_live_target(struct mapped_device *md,
 }
 
 static long dm_dax_direct_access(struct dax_device *dax_dev, pgoff_t pgoff,
-		long nr_pages, void **kaddr, pfn_t *pfn)
+				 long nr_pages, void **kaddr, pfn_t *pfn)
 {
 	struct mapped_device *md = dax_get_private(dax_dev);
 	sector_t sector = pgoff * PAGE_SECTORS;
@@ -1065,7 +1066,7 @@ static long dm_dax_direct_access(struct dax_device *dax_dev, pgoff_t pgoff,
 }
 
 static size_t dm_dax_copy_from_iter(struct dax_device *dax_dev, pgoff_t pgoff,
-		void *addr, size_t bytes, struct iov_iter *i)
+				    void *addr, size_t bytes, struct iov_iter *i)
 {
 	struct mapped_device *md = dax_get_private(dax_dev);
 	sector_t sector = pgoff * PAGE_SECTORS;

Original file line number	Diff line number	Diff line change
`@@ -1020,7 +1020,8 @@ int dm_set_target_max_io_len(struct dm_target *ti, sector_t len)`
`1020`	`1020`	`EXPORT_SYMBOL_GPL(dm_set_target_max_io_len);`
`1021`	`1021`
`1022`	`1022`	`static 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`	`1026`	`struct dm_table *map;`
`1026`	`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`
`1039`	`1040`	`static 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`	`1043`	`struct mapped_device *md = dax_get_private(dax_dev);`
`1043`	`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`
`1067`	`1068`	`static 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`	`1071`	`struct mapped_device *md = dax_get_private(dax_dev);`
`1071`	`1072`	`sector_t sector = pgoff * PAGE_SECTORS;`