Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[sfrench/cifs-2.6.git] / fs / dax.c

diff --git a/fs/dax.c b/fs/dax.c
index f001d8c72a065173bc4f68733872a4c36413aece..f3a44a7c14b35f674c34867af97d6a7681adb1eb 100644 (file)
--- a/fs/dax.c
+++ b/fs/dax.c
@@ -938,7 +938,7 @@ EXPORT_SYMBOL_GPL(__dax_zero_page_range);
 
 static sector_t dax_iomap_sector(struct iomap *iomap, loff_t pos)
 {
-       return iomap->blkno + (((pos & PAGE_MASK) - iomap->offset) >> 9);
+       return (iomap->addr + (pos & PAGE_MASK) - iomap->offset) >> 9;
 }
 
 static loff_t