From: Trond Myklebust <trond.myklebust@primarydata.com>
To: linux-nfs@vger.kernel.org
Subject: [PATCH v4 16/17] NFS: Remove unused function nfs_revalidate_mapping_protected()
Date: Thu, 23 Jun 2016 16:00:48 -0400 [thread overview]
Message-ID: <1466712049-5326-16-git-send-email-trond.myklebust@primarydata.com> (raw)
In-Reply-To: <1466712049-5326-15-git-send-email-trond.myklebust@primarydata.com>
Clean up...
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
---
fs/nfs/inode.c | 38 ++++----------------------------------
include/linux/nfs_fs.h | 1 -
2 files changed, 4 insertions(+), 35 deletions(-)
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index 4e65a5a8a01b..b3404b676946 100644
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
@@ -1124,14 +1124,12 @@ out:
}
/**
- * __nfs_revalidate_mapping - Revalidate the pagecache
+ * nfs_revalidate_mapping - Revalidate the pagecache
* @inode - pointer to host inode
* @mapping - pointer to mapping
- * @may_lock - take inode->i_mutex?
*/
-static int __nfs_revalidate_mapping(struct inode *inode,
- struct address_space *mapping,
- bool may_lock)
+int nfs_revalidate_mapping(struct inode *inode,
+ struct address_space *mapping)
{
struct nfs_inode *nfsi = NFS_I(inode);
unsigned long *bitlock = &nfsi->flags;
@@ -1180,12 +1178,7 @@ static int __nfs_revalidate_mapping(struct inode *inode,
nfsi->cache_validity &= ~NFS_INO_INVALID_DATA;
spin_unlock(&inode->i_lock);
trace_nfs_invalidate_mapping_enter(inode);
- if (may_lock) {
- inode_lock(inode);
- ret = nfs_invalidate_mapping(inode, mapping);
- inode_unlock(inode);
- } else
- ret = nfs_invalidate_mapping(inode, mapping);
+ ret = nfs_invalidate_mapping(inode, mapping);
trace_nfs_invalidate_mapping_exit(inode, ret);
clear_bit_unlock(NFS_INO_INVALIDATING, bitlock);
@@ -1195,29 +1188,6 @@ out:
return ret;
}
-/**
- * nfs_revalidate_mapping - Revalidate the pagecache
- * @inode - pointer to host inode
- * @mapping - pointer to mapping
- */
-int nfs_revalidate_mapping(struct inode *inode, struct address_space *mapping)
-{
- return __nfs_revalidate_mapping(inode, mapping, false);
-}
-
-/**
- * nfs_revalidate_mapping_protected - Revalidate the pagecache
- * @inode - pointer to host inode
- * @mapping - pointer to mapping
- *
- * Differs from nfs_revalidate_mapping() in that it grabs the inode->i_mutex
- * while invalidating the mapping.
- */
-int nfs_revalidate_mapping_protected(struct inode *inode, struct address_space *mapping)
-{
- return __nfs_revalidate_mapping(inode, mapping, true);
-}
-
static bool nfs_file_has_writers(struct nfs_inode *nfsi)
{
struct inode *inode = &nfsi->vfs_inode;
diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
index 225d17d35277..810124b33327 100644
--- a/include/linux/nfs_fs.h
+++ b/include/linux/nfs_fs.h
@@ -351,7 +351,6 @@ extern int nfs_revalidate_inode_rcu(struct nfs_server *server, struct inode *ino
extern int __nfs_revalidate_inode(struct nfs_server *, struct inode *);
extern int nfs_revalidate_mapping(struct inode *inode, struct address_space *mapping);
extern int nfs_revalidate_mapping_rcu(struct inode *inode);
-extern int nfs_revalidate_mapping_protected(struct inode *inode, struct address_space *mapping);
extern int nfs_setattr(struct dentry *, struct iattr *);
extern void nfs_setattr_update_inode(struct inode *inode, struct iattr *attr, struct nfs_fattr *);
extern void nfs_setsecurity(struct inode *inode, struct nfs_fattr *fattr,
--
2.7.4
next prev parent reply other threads:[~2016-06-23 20:01 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-23 20:00 [PATCH v4 01/17] NFS: Don't flush caches for a getattr that races with writeback Trond Myklebust
2016-06-23 20:00 ` [PATCH v4 02/17] NFS: Cache access checks more aggressively Trond Myklebust
2016-06-23 20:00 ` [PATCH v4 03/17] NFS: Cache aggressively when file is open for writing Trond Myklebust
2016-06-23 20:00 ` [PATCH v4 04/17] NFS: Kill NFS_INO_NFS_INO_FLUSHING: it is a performance killer Trond Myklebust
2016-06-23 20:00 ` [PATCH v4 05/17] NFS: writepage of a single page should not be synchronous Trond Myklebust
2016-06-23 20:00 ` [PATCH v4 06/17] NFS: Don't hold the inode lock across fsync() Trond Myklebust
2016-06-23 20:00 ` [PATCH v4 07/17] NFS: Don't call COMMIT in ->releasepage() Trond Myklebust
2016-06-23 20:00 ` [PATCH v4 08/17] NFS: Fix O_DIRECT verifier problems Trond Myklebust
2016-06-23 20:00 ` [PATCH v4 09/17] NFS: Ensure we reset the write verifier 'committed' value on resend Trond Myklebust
2016-06-23 20:00 ` [PATCH v4 10/17] NFS: Remove racy size manipulations in O_DIRECT Trond Myklebust
2016-06-23 20:00 ` [PATCH v4 11/17] NFS Cleanup: move call to generic_write_checks() into fs/nfs/direct.c Trond Myklebust
2016-06-23 20:00 ` [PATCH v4 12/17] NFS: Move buffered I/O locking into nfs_file_write() Trond Myklebust
2016-06-23 20:00 ` [PATCH v4 13/17] NFS: Do not serialise O_DIRECT reads and writes Trond Myklebust
2016-06-23 20:00 ` [PATCH v4 14/17] NFS: Cleanup nfs_direct_complete() Trond Myklebust
2016-06-23 20:00 ` [PATCH v4 15/17] NFS: Remove redundant waits for O_DIRECT in fsync() and write_begin() Trond Myklebust
2016-06-23 20:00 ` Trond Myklebust [this message]
2016-06-23 20:00 ` [PATCH v4 17/17] NFS nfs_vm_page_mkwrite: Don't freeze me, Bro Trond Myklebust
2016-06-28 12:12 ` [PATCH v4 01/17] NFS: Don't flush caches for a getattr that races with writeback Christoph Hellwig
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=1466712049-5326-16-git-send-email-trond.myklebust@primarydata.com \
--to=trond.myklebust@primarydata.com \
--cc=linux-nfs@vger.kernel.org \
/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).