From: Ross Zwisler <ross.zwisler@linux.intel.com>
To: akpm@linux-foundation.org
Cc: Ross Zwisler <ross.zwisler@linux.intel.com>,
dave.hansen@linux.intel.com, mawilcox@microsoft.com,
linux-nvdimm@lists.01.org, linux-xfs@vger.kernel.org,
linux-mm@kvack.org, vbabka@suse.cz, jack@suse.com,
dan.j.williams@intel.com, linux-ext4@vger.kernel.org,
kirill.shutemov@linux.intel.com,
Dave Jiang <dave.jiang@intel.com>
Subject: [PATCH] ext4: Remove unused function ext4_dax_huge_fault()
Date: Mon, 30 Jan 2017 14:52:52 -0700 [thread overview]
Message-ID: <1485813172-7284-1-git-send-email-ross.zwisler@linux.intel.com> (raw)
In-Reply-To: <148545058784.17912.6353162518188733642.stgit@djiang5-desk3.ch.intel.com>
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)
Signed-off-by: Ross Zwisler <ross.zwisler@linux.intel.com>
Fixes: 7e90fc0f8785 ("mm,fs,dax: change ->pmd_fault to ->huge_fault")
Cc: Dave Jiang <dave.jiang@intel.com>
---
Feel free to squash with 7e90fc0f8785 if that's best.
The commit ID of the original patch comes from mmots/master which is
currently at v4.10-rc5-mmots-2017-01-26-15-49.
---
fs/ext4/file.c | 21 ---------------------
1 file changed, 21 deletions(-)
diff --git a/fs/ext4/file.c b/fs/ext4/file.c
index ed22d20..51d7155 100644
--- a/fs/ext4/file.c
+++ b/fs/ext4/file.c
@@ -275,27 +275,6 @@ static int ext4_dax_fault(struct vm_fault *vmf)
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
--
2.7.4
next prev parent reply other threads:[~2017-01-30 21:53 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-26 17:09 [PATCH v2 0/3] 1G transparent hugepage support for device dax Dave Jiang
2017-01-26 17:09 ` [PATCH v2 1/3] mm,fs,dax: Change ->pmd_fault to ->huge_fault Dave Jiang
2017-01-30 21:52 ` Ross Zwisler [this message]
2017-01-30 23:43 ` Ross Zwisler
2017-01-31 0:15 ` Dave Jiang
2017-01-26 17:09 ` [PATCH v2 2/3] mm, x86: Add support for PUD-sized transparent hugepages Dave Jiang
2017-01-26 22:38 ` Andrew Morton
2017-01-26 22:46 ` Dave Jiang
2017-01-26 17:10 ` [PATCH v2 3/3] dax: Support for transparent PUD pages for device DAX Dave Jiang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1485813172-7284-1-git-send-email-ross.zwisler@linux.intel.com \
--to=ross.zwisler@linux.intel.com \
--cc=akpm@linux-foundation.org \
--cc=dan.j.williams@intel.com \
--cc=dave.hansen@linux.intel.com \
--cc=dave.jiang@intel.com \
--cc=jack@suse.com \
--cc=kirill.shutemov@linux.intel.com \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-nvdimm@lists.01.org \
--cc=linux-xfs@vger.kernel.org \
--cc=mawilcox@microsoft.com \
--cc=vbabka@suse.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).