* [PATCH] ext4: fix up huge_fault rename
@ 2017-02-02 11:36 Arnd Bergmann
2017-02-02 20:02 ` Ross Zwisler
0 siblings, 1 reply; 2+ messages in thread
From: Arnd Bergmann @ 2017-02-02 11:36 UTC (permalink / raw)
To: Andrew Morton
Cc: Matthew Wilcox, Arnd Bergmann, Theodore Ts'o, Andreas Dilger,
Jan Kara, Ross Zwisler, Dave Jiang, Miklos Szeredi, linux-ext4,
linux-kernel
It looks like a search+replace accidentally change one function pointer that
should have remained as before, as shown by this new warning:
fs/ext4/file.c:279:1: error: 'ext4_dax_huge_fault' defined but not used [-Werror=unused-function]
This reverts the one line of the changeset.
Fixes: 80a841811260 ("mm,fs,dax: change ->pmd_fault to ->huge_fault")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
fs/ext4/file.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/ext4/file.c b/fs/ext4/file.c
index ed22d20e843c..e1a581133aa1 100644
--- a/fs/ext4/file.c
+++ b/fs/ext4/file.c
@@ -329,7 +329,7 @@ static int ext4_dax_pfn_mkwrite(struct vm_fault *vmf)
static const struct vm_operations_struct ext4_dax_vm_ops = {
.fault = ext4_dax_fault,
.huge_fault = ext4_dax_fault,
- .page_mkwrite = ext4_dax_fault,
+ .page_mkwrite = ext4_dax_huge_fault,
.pfn_mkwrite = ext4_dax_pfn_mkwrite,
};
#else
--
2.9.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] ext4: fix up huge_fault rename
2017-02-02 11:36 [PATCH] ext4: fix up huge_fault rename Arnd Bergmann
@ 2017-02-02 20:02 ` Ross Zwisler
0 siblings, 0 replies; 2+ messages in thread
From: Ross Zwisler @ 2017-02-02 20:02 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Andrew Morton, Matthew Wilcox, Theodore Ts'o, Andreas Dilger,
Jan Kara, Ross Zwisler, Dave Jiang, Miklos Szeredi, linux-ext4,
linux-kernel
On Thu, Feb 02, 2017 at 12:36:12PM +0100, Arnd Bergmann wrote:
> It looks like a search+replace accidentally change one function pointer that
> should have remained as before, as shown by this new warning:
>
> fs/ext4/file.c:279:1: error: 'ext4_dax_huge_fault' defined but not used [-Werror=unused-function]
>
> This reverts the one line of the changeset.
>
> Fixes: 80a841811260 ("mm,fs,dax: change ->pmd_fault to ->huge_fault")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> fs/ext4/file.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/ext4/file.c b/fs/ext4/file.c
> index ed22d20e843c..e1a581133aa1 100644
> --- a/fs/ext4/file.c
> +++ b/fs/ext4/file.c
> @@ -329,7 +329,7 @@ static int ext4_dax_pfn_mkwrite(struct vm_fault *vmf)
> static const struct vm_operations_struct ext4_dax_vm_ops = {
> .fault = ext4_dax_fault,
> .huge_fault = ext4_dax_fault,
> - .page_mkwrite = ext4_dax_fault,
> + .page_mkwrite = ext4_dax_huge_fault,
> .pfn_mkwrite = ext4_dax_pfn_mkwrite,
> };
> #else
> --
> 2.9.0
Hey Arnd,
I saw this as well, but fixed it by removing ext4_dax_huge_fault() since after
Dave's changes ext4_dax_fault() and ext4_dax_huge_fault() are identical.
http://www.spinics.net/lists/linux-mm/msg121117.html
If you're alright with it let's go that way so we can remove a redundant
function.
- Ross
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-02-02 20:02 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-02-02 11:36 [PATCH] ext4: fix up huge_fault rename Arnd Bergmann
2017-02-02 20:02 ` Ross Zwisler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).