Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1200269

[PATCH 11/11] dax: Use linear_page_index()

Show all headers | View raw

From: Matthew Wilcox <willy@linux.intel.com>

I was basically open-coding it (thanks to copying code from do_fault()
which probably also needs to be fixed).

Signed-off-by: Matthew Wilcox <willy@linux.intel.com>
---
 fs/dax.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/dax.c b/fs/dax.c
index 233e61e..b6769ce 100644
--- a/fs/dax.c
+++ b/fs/dax.c
@@ -529,7 +529,7 @@ int __dax_pmd_fault(struct vm_area_struct *vma, unsigned long address,
 	if ((pmd_addr + PMD_SIZE) > vma->vm_end)
 		return VM_FAULT_FALLBACK;
 
-	pgoff = ((pmd_addr - vma->vm_start) >> PAGE_SHIFT) + vma->vm_pgoff;
+	pgoff = linear_page_index(vma, pmd_addr);
 	size = (i_size_read(inode) + PAGE_SIZE - 1) >> PAGE_SHIFT;
 	if (pgoff >= size)
 		return VM_FAULT_SIGBUS;
-- 
2.1.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 00/11] DAX fixes for 4.3 Matthew Wilcox <matthew.r.wilcox@intel.com> - 2015-08-04 22:00 +0200
  [PATCH 10/11] dax: Ensure that zero pages are removed from other processes Matthew Wilcox <matthew.r.wilcox@intel.com> - 2015-08-04 22:00 +0200
  [PATCH 09/11] dax: Don't use set_huge_zero_page() Matthew Wilcox <matthew.r.wilcox@intel.com> - 2015-08-04 22:00 +0200
  [PATCH 07/11] thp: Decrement refcount on huge zero page if it is split Matthew Wilcox <matthew.r.wilcox@intel.com> - 2015-08-04 22:00 +0200
  [PATCH 08/11] thp: Fix zap_huge_pmd() for DAX Matthew Wilcox <matthew.r.wilcox@intel.com> - 2015-08-04 22:00 +0200
  [PATCH 01/11] ext4: Use ext4_get_block_write() for DAX Matthew Wilcox <matthew.r.wilcox@intel.com> - 2015-08-04 22:10 +0200
  [PATCH 06/11] dax: Fix race between simultaneous faults Matthew Wilcox <matthew.r.wilcox@intel.com> - 2015-08-04 22:10 +0200
    Re: [PATCH 06/11] dax: Fix race between simultaneous faults "Kirill A. Shutemov" <kirill@shutemov.name> - 2015-08-05 13:50 +0200
  [PATCH 11/11] dax: Use linear_page_index() Matthew Wilcox <matthew.r.wilcox@intel.com> - 2015-08-04 22:10 +0200
  [PATCH 04/11] ext4: Add ext4_get_block_dax() Matthew Wilcox <matthew.r.wilcox@intel.com> - 2015-08-04 22:10 +0200
    Re: [PATCH 04/11] ext4: Add ext4_get_block_dax() Dave Chinner <david@fromorbit.com> - 2015-08-05 04:10 +0200
      Re: [PATCH 04/11] ext4: Add ext4_get_block_dax() Matthew Wilcox <willy@linux.intel.com> - 2015-08-05 17:20 +0200
  [PATCH 05/11] ext4: Start transaction before calling into DAX Matthew Wilcox <matthew.r.wilcox@intel.com> - 2015-08-04 22:10 +0200

csiph-web