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

Groups > linux.kernel > #1200266

[PATCH 01/11] ext4: Use ext4_get_block_write() for DAX

Show all headers | View raw

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

DAX relies on the get_block function either zeroing newly allocated blocks
before they're findable by subsequent calls to get_block, or marking newly
allocated blocks as unwritten.  ext4_get_block() cannot create unwritten
extents, but ext4_get_block_write() can.

Reported-by: Andy Rudoff <andy.rudoff@intel.com>
Signed-off-by: Matthew Wilcox <willy@linux.intel.com>
---
 fs/ext4/file.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/fs/ext4/file.c b/fs/ext4/file.c
index 953d519..ca5302a 100644
--- a/fs/ext4/file.c
+++ b/fs/ext4/file.c
@@ -196,7 +196,7 @@ out:
 static void ext4_end_io_unwritten(struct buffer_head *bh, int uptodate)
 {
 	struct inode *inode = bh->b_assoc_map->host;
-	/* XXX: breaks on 32-bit > 16GB. Is that even supported? */
+	/* XXX: breaks on 32-bit > 16TB. Is that even supported? */
 	loff_t offset = (loff_t)(uintptr_t)bh->b_private << inode->i_blkbits;
 	int err;
 	if (!uptodate)
@@ -207,8 +207,7 @@ static void ext4_end_io_unwritten(struct buffer_head *bh, int uptodate)
 
 static int ext4_dax_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 {
-	return dax_fault(vma, vmf, ext4_get_block, ext4_end_io_unwritten);
-					/* Is this the right get_block? */
+	return dax_fault(vma, vmf, ext4_get_block_write, ext4_end_io_unwritten);
 }
 
 static int ext4_dax_pmd_fault(struct vm_area_struct *vma, unsigned long addr,
@@ -220,7 +219,8 @@ static int ext4_dax_pmd_fault(struct vm_area_struct *vma, unsigned long addr,
 
 static int ext4_dax_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
 {
-	return dax_mkwrite(vma, vmf, ext4_get_block, ext4_end_io_unwritten);
+	return dax_mkwrite(vma, vmf, ext4_get_block_write,
+				ext4_end_io_unwritten);
 }
 
 static const struct vm_operations_struct ext4_dax_vm_ops = {
-- 
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