Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be527494 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFS: Remove unused function nfs_revalidate_mapping_protected() 



Clean up...

Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent f508d46a

fs/nfs/inode.c

+4 −34
Original line number Diff line number Diff line
@@ -1131,14 +1131,12 @@ int nfs_revalidate_mapping_rcu(struct inode *inode) 
}



/**

 * __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;
@@ -1187,11 +1185,6 @@ 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);

	trace_nfs_invalidate_mapping_exit(inode, ret);
@@ -1202,29 +1195,6 @@ static int __nfs_revalidate_mapping(struct inode *inode, 
	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;

include/linux/nfs_fs.h

+0 −1
Original line number Diff line number Diff line
@@ -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,