The patch titled
Subject: ext4: Remove unused function ext4_dax_huge_fault()
has been removed from the -mm tree. Its filename was
mmfsdax-change-pmd_fault-to-huge_fault-fix-2.patch
This patch was dropped because it was folded into mmfsdax-change-pmd_fault-to-huge_fault.patch
------------------------------------------------------
From: Ross Zwisler <ross.zwisler@xxxxxxxxxxxxxxx>
Subject: ext4: Remove unused function ext4_dax_huge_fault()
ext4_dax_pmd_fault() was renamed to ext4_dax_huge_fault() in this commit:
commit 7e90fc0f8785 ("mm,fs,dax: change ->pmd_fault to ->huge_fault")
However, the vm_operations_struct ops table for ext4 was modified in that
commit so that .huge_fault called ext4_dax_fault(), not
ext4_dax_huge_fault(). This is actually fine, though, since as of that
commit ext4_dax_fault() and ext4_dax_huge_fault() are identical, both
eventually calling dax_iomap_fault().
So, instead of changing the opts table to have .huge_fault call
ext4_dax_huge_fault(), just leave it calling ext4_dax_fault() and remove
the unused function.
This fix also quiets the following compilation warning:
/ext4/file.c:279:1: warning: `ext4_dax_huge_fault' defined but not used [-Wunused-function]
ext4_dax_huge_fault(struct vm_fault *vmf)
Fixes: 7e90fc0f8785 ("mm,fs,dax: change ->pmd_fault to ->huge_fault")
Link: http://lkml.kernel.org/r/1485813172-7284-1-git-send-email-ross.zwisler@xxxxxxxxxxxxxxx
Signed-off-by: Ross Zwisler <ross.zwisler@xxxxxxxxxxxxxxx>
Cc: Dave Jiang <dave.jiang@xxxxxxxxx>
Cc: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Cc: Arnd Bergmann <arnd@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/ext4/file.c | 21 ---------------------
1 file changed, 21 deletions(-)
diff -puN fs/ext4/file.c~mmfsdax-change-pmd_fault-to-huge_fault-fix-2 fs/ext4/file.c
--- a/fs/ext4/file.c~mmfsdax-change-pmd_fault-to-huge_fault-fix-2
+++ a/fs/ext4/file.c
@@ -273,27 +273,6 @@ static int ext4_dax_fault(struct vm_faul
return result;
}
-static int
-ext4_dax_huge_fault(struct vm_fault *vmf)
-{
- int result;
- struct inode *inode = file_inode(vmf->vma->vm_file);
- struct super_block *sb = inode->i_sb;
- bool write = vmf->flags & FAULT_FLAG_WRITE;
-
- if (write) {
- sb_start_pagefault(sb);
- file_update_time(vmf->vma->vm_file);
- }
- down_read(&EXT4_I(inode)->i_mmap_sem);
- result = dax_iomap_fault(vmf, &ext4_iomap_ops);
- up_read(&EXT4_I(inode)->i_mmap_sem);
- if (write)
- sb_end_pagefault(sb);
-
- return result;
-}
-
/*
* Handle write fault for VM_MIXEDMAP mappings. Similarly to ext4_dax_fault()
* handler we check for races agaist truncate. Note that since we cycle through
_
Patches currently in -mm which might be from ross.zwisler@xxxxxxxxxxxxxxx are
mmfsdax-change-pmd_fault-to-huge_fault.patch
drm-remove-unnecessary-fault-wrappers.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
