nfs{,4}: switch to ->free_inode()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index 414a90d48493d99aab7492b9b7932f838675c90c..f61af8307dc88fdb0d06db04df0008649865f8e7 100644 (file)
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
@@ -2055,17 +2055,11 @@ struct inode *nfs_alloc_inode(struct super_block *sb)
 }
 EXPORT_SYMBOL_GPL(nfs_alloc_inode);
 
-static void nfs_i_callback(struct rcu_head *head)
+void nfs_free_inode(struct inode *inode)
 {
-       struct inode *inode = container_of(head, struct inode, i_rcu);
        kmem_cache_free(nfs_inode_cachep, NFS_I(inode));
 }
-
-void nfs_destroy_inode(struct inode *inode)
-{
-       call_rcu(&inode->i_rcu, nfs_i_callback);
-}
-EXPORT_SYMBOL_GPL(nfs_destroy_inode);
+EXPORT_SYMBOL_GPL(nfs_free_inode);
 
 static inline void nfs4_init_once(struct nfs_inode *nfsi)
 {

diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h
index c7cf23ae6597bceaac9b7e427356807200d49365..331a0504eaf8407e82e38655cc2324fa470de80f 100644 (file)
--- a/fs/nfs/internal.h
+++ b/fs/nfs/internal.h
@@ -381,7 +381,7 @@ int nfs_check_flags(int);
 /* inode.c */
 extern struct workqueue_struct *nfsiod_workqueue;
 extern struct inode *nfs_alloc_inode(struct super_block *sb);
-extern void nfs_destroy_inode(struct inode *);
+extern void nfs_free_inode(struct inode *);
 extern int nfs_write_inode(struct inode *, struct writeback_control *);
 extern int nfs_drop_inode(struct inode *);
 extern void nfs_clear_inode(struct inode *);

diff --git a/fs/nfs/nfs4super.c b/fs/nfs/nfs4super.c
index 6fb7cb6b3f4b038398e3c8ef1681cc4d274636a5..689977e148cbf947882dcb484cb2c961ad1b74bb 100644 (file)
--- a/fs/nfs/nfs4super.c
+++ b/fs/nfs/nfs4super.c
@@ -50,7 +50,7 @@ struct file_system_type nfs4_referral_fs_type = {
 
 static const struct super_operations nfs4_sops = {
        .alloc_inode    = nfs_alloc_inode,
-       .destroy_inode  = nfs_destroy_inode,
+       .free_inode     = nfs_free_inode,
        .write_inode    = nfs4_write_inode,
        .drop_inode     = nfs_drop_inode,
        .statfs         = nfs_statfs,

diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index 23790c7b2289d21328db2a824eef5c6484e29089..aec4e2c4b02fa1634ad806f224bf1cc3b2a00d7c 100644 (file)
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -309,7 +309,7 @@ struct file_system_type nfs_xdev_fs_type = {
 
 const struct super_operations nfs_sops = {
        .alloc_inode    = nfs_alloc_inode,
-       .destroy_inode  = nfs_destroy_inode,
+       .free_inode     = nfs_free_inode,
        .write_inode    = nfs_write_inode,
        .drop_inode     = nfs_drop_inode,
        .statfs         = nfs_statfs,