1 files changed, 47 insertions, 58 deletions

diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index 35f7e4bc680e..2ed6138f32ad 100644
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
@@ -50,6 +50,7 @@
 #include "fscache.h"
 #include "dns_resolve.h"
 #include "pnfs.h"
+#include "nfs.h"
 #include "netns.h"
 
 #define NFSDBG_FACILITY         NFSDBG_VFS
@@ -81,6 +82,7 @@ int nfs_wait_bit_killable(void *word)
         freezable_schedule();
         return 0;
 }
+EXPORT_SYMBOL_GPL(nfs_wait_bit_killable);
 
 /**
  * nfs_compat_user_ino64 - returns the user-visible inode number
@@ -105,7 +107,7 @@ u64 nfs_compat_user_ino64(u64 fileid)
         return ino;
 }
 
-static void nfs_clear_inode(struct inode *inode)
+void nfs_clear_inode(struct inode *inode)
 {
         /*
          * The following should never happen...
@@ -116,6 +118,7 @@ static void nfs_clear_inode(struct inode *inode)
         nfs_access_zap_cache(inode);
         nfs_fscache_release_inode_cookie(inode);
 }
+EXPORT_SYMBOL_GPL(nfs_clear_inode);
 
 void nfs_evict_inode(struct inode *inode)
 {
@@ -185,6 +188,7 @@ void nfs_zap_acl_cache(struct inode *inode)
         NFS_I(inode)->cache_validity &= ~NFS_INO_INVALID_ACL;
         spin_unlock(&inode->i_lock);
 }
+EXPORT_SYMBOL_GPL(nfs_zap_acl_cache);
 
 void nfs_invalidate_atime(struct inode *inode)
 {
@@ -192,6 +196,7 @@ void nfs_invalidate_atime(struct inode *inode)
         NFS_I(inode)->cache_validity |= NFS_INO_INVALID_ATIME;
         spin_unlock(&inode->i_lock);
 }
+EXPORT_SYMBOL_GPL(nfs_invalidate_atime);
 
 /*
  * Invalidate, but do not unhash, the inode.
@@ -390,6 +395,7 @@ out_no_inode:
         dprintk("nfs_fhget: iget failed with error %ld\n", PTR_ERR(inode));
         goto out;
 }
+EXPORT_SYMBOL_GPL(nfs_fhget);
 
 #define NFS_VALID_ATTRS (ATTR_MODE|ATTR_UID|ATTR_GID|ATTR_SIZE|ATTR_ATIME|ATTR_ATIME_SET|ATTR_MTIME|ATTR_MTIME_SET|ATTR_FILE|ATTR_OPEN)
 
@@ -437,6 +443,7 @@ nfs_setattr(struct dentry *dentry, struct iattr *attr)
 out:
         return error;
 }
+EXPORT_SYMBOL_GPL(nfs_setattr);
 
 /**
  * nfs_vmtruncate - unmap mappings "freed" by truncate() syscall
@@ -495,6 +502,7 @@ void nfs_setattr_update_inode(struct inode *inode, struct iattr *attr)
                 nfs_vmtruncate(inode, attr->ia_size);
         }
 }
+EXPORT_SYMBOL_GPL(nfs_setattr_update_inode);
 
 int nfs_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
 {
@@ -534,6 +542,7 @@ int nfs_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
 out:
         return err;
 }
+EXPORT_SYMBOL_GPL(nfs_getattr);
 
 static void nfs_init_lock_context(struct nfs_lock_context *l_ctx)
 {
@@ -622,6 +631,7 @@ void nfs_close_context(struct nfs_open_context *ctx, int is_sync)
                 return;
         nfs_revalidate_inode(server, inode);
 }
+EXPORT_SYMBOL_GPL(nfs_close_context);
 
 struct nfs_open_context *alloc_nfs_open_context(struct dentry *dentry, fmode_t f_mode)
 {
@@ -648,6 +658,7 @@ struct nfs_open_context *alloc_nfs_open_context(struct dentry *dentry, fmode_t f
         ctx->mdsthreshold = NULL;
         return ctx;
 }
+EXPORT_SYMBOL_GPL(alloc_nfs_open_context);
 
 struct nfs_open_context *get_nfs_open_context(struct nfs_open_context *ctx)
 {
@@ -655,6 +666,7 @@ struct nfs_open_context *get_nfs_open_context(struct nfs_open_context *ctx)
                 atomic_inc(&ctx->lock_context.count);
         return ctx;
 }
+EXPORT_SYMBOL_GPL(get_nfs_open_context);
 
 static void __put_nfs_open_context(struct nfs_open_context *ctx, int is_sync)
 {
@@ -682,6 +694,7 @@ void put_nfs_open_context(struct nfs_open_context *ctx)
 {
         __put_nfs_open_context(ctx, 0);
 }
+EXPORT_SYMBOL_GPL(put_nfs_open_context);
 
 /*
  * Ensure that mmap has a recent RPC credential for use when writing out
@@ -697,6 +710,7 @@ void nfs_file_set_open_context(struct file *filp, struct nfs_open_context *ctx)
         list_add(&ctx->list, &nfsi->open_files);
         spin_unlock(&inode->i_lock);
 }
+EXPORT_SYMBOL_GPL(nfs_file_set_open_context);
 
 /*
  * Given an inode, search for an open context with the desired characteristics
@@ -841,6 +855,7 @@ int nfs_revalidate_inode(struct nfs_server *server, struct inode *inode)
                 return NFS_STALE(inode) ? -ESTALE : 0;
         return __nfs_revalidate_inode(server, inode);
 }
+EXPORT_SYMBOL_GPL(nfs_revalidate_inode);
 
 static int nfs_invalidate_mapping(struct inode *inode, struct address_space *mapping)
 {
@@ -1027,6 +1042,7 @@ void nfs_fattr_init(struct nfs_fattr *fattr)
         fattr->owner_name = NULL;
         fattr->group_name = NULL;
 }
+EXPORT_SYMBOL_GPL(nfs_fattr_init);
 
 struct nfs_fattr *nfs_alloc_fattr(void)
 {
@@ -1037,6 +1053,7 @@ struct nfs_fattr *nfs_alloc_fattr(void)
                 nfs_fattr_init(fattr);
         return fattr;
 }
+EXPORT_SYMBOL_GPL(nfs_alloc_fattr);
 
 struct nfs_fh *nfs_alloc_fhandle(void)
 {
@@ -1047,6 +1064,7 @@ struct nfs_fh *nfs_alloc_fhandle(void)
                 fh->size = 0;
         return fh;
 }
+EXPORT_SYMBOL_GPL(nfs_alloc_fhandle);
 
 #ifdef NFS_DEBUG
 /*
@@ -1167,6 +1185,7 @@ int nfs_refresh_inode(struct inode *inode, struct nfs_fattr *fattr)
 
         return status;
 }
+EXPORT_SYMBOL_GPL(nfs_refresh_inode);
 
 static int nfs_post_op_update_inode_locked(struct inode *inode, struct nfs_fattr *fattr)
 {
@@ -1203,6 +1222,7 @@ int nfs_post_op_update_inode(struct inode *inode, struct nfs_fattr *fattr)
         spin_unlock(&inode->i_lock);
         return status;
 }
+EXPORT_SYMBOL_GPL(nfs_post_op_update_inode);
 
 /**
  * nfs_post_op_update_inode_force_wcc - try to update the inode attribute cache
@@ -1254,6 +1274,7 @@ out_noforce:
         spin_unlock(&inode->i_lock);
         return status;
 }
+EXPORT_SYMBOL_GPL(nfs_post_op_update_inode_force_wcc);
 
 /*
  * Many nfs protocol calls return the new file attributes after
@@ -1471,27 +1492,6 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr)
         return -ESTALE;
 }
 
-
-#ifdef CONFIG_NFS_V4
-
-/*
- * Clean out any remaining NFSv4 state that might be left over due
- * to open() calls that passed nfs_atomic_lookup, but failed to call
- * nfs_open().
- */
-void nfs4_evict_inode(struct inode *inode)
-{
-        truncate_inode_pages(&inode->i_data, 0);
-        clear_inode(inode);
-        pnfs_return_layout(inode);
-        pnfs_destroy_layout(NFS_I(inode));
-        /* If we are holding a delegation, return it! */
-        nfs_inode_return_delegation_noreclaim(inode);
-        /* First call standard NFS clear_inode() code */
-        nfs_clear_inode(inode);
-}
-#endif
-
 struct inode *nfs_alloc_inode(struct super_block *sb)
 {
         struct nfs_inode *nfsi;
@@ -1504,11 +1504,12 @@ struct inode *nfs_alloc_inode(struct super_block *sb)
         nfsi->acl_access = ERR_PTR(-EAGAIN);
         nfsi->acl_default = ERR_PTR(-EAGAIN);
 #endif
-#ifdef CONFIG_NFS_V4
+#if IS_ENABLED(CONFIG_NFS_V4)
         nfsi->nfs4_acl = NULL;
 #endif /* CONFIG_NFS_V4 */
         return &nfsi->vfs_inode;
 }
+EXPORT_SYMBOL_GPL(nfs_alloc_inode);
 
 static void nfs_i_callback(struct rcu_head *head)
 {
@@ -1520,10 +1521,11 @@ void nfs_destroy_inode(struct inode *inode)
 {
         call_rcu(&inode->i_rcu, nfs_i_callback);
 }
+EXPORT_SYMBOL_GPL(nfs_destroy_inode);
 
 static inline void nfs4_init_once(struct nfs_inode *nfsi)
 {
-#ifdef CONFIG_NFS_V4
+#if IS_ENABLED(CONFIG_NFS_V4)
         INIT_LIST_HEAD(&nfsi->open_states);
         nfsi->delegation = NULL;
         nfsi->delegation_state = 0;
@@ -1569,6 +1571,7 @@ static void nfs_destroy_inodecache(void)
 }
 
 struct workqueue_struct *nfsiod_workqueue;
+EXPORT_SYMBOL_GPL(nfsiod_workqueue);
 
 /*
  * start up the nfsiod workqueue
@@ -1629,94 +1632,80 @@ static int __init init_nfs_fs(void)
 
         err = nfs_dns_resolver_init();
         if (err < 0)
-                goto out11;
+                goto out10;;
 
         err = register_pernet_subsys(&nfs_net_ops);
         if (err < 0)
-                goto out10;
+                goto out9;
 
         err = nfs_fscache_register();
         if (err < 0)
-                goto out9;
+                goto out8;
 
         err = nfsiod_start();
         if (err)
-                goto out8;
+                goto out7;
 
         err = nfs_fs_proc_init();
         if (err)
-                goto out7;
+                goto out6;
 
         err = nfs_init_nfspagecache();
         if (err)
-                goto out6;
+                goto out5;
 
         err = nfs_init_inodecache();
         if (err)
-                goto out5;
+                goto out4;
 
         err = nfs_init_readpagecache();
         if (err)
-                goto out4;
+                goto out3;
 
         err = nfs_init_writepagecache();
         if (err)
-                goto out3;
+                goto out2;
 
         err = nfs_init_directcache();
         if (err)
-                goto out2;
+                goto out1;
 
 #ifdef CONFIG_PROC_FS
         rpc_proc_register(&init_net, &nfs_rpcstat);
 #endif
-
-#ifdef CONFIG_NFS_V4
-        err = init_nfs_v4();
-        if (err)
-                goto out1;
-#endif
-
         if ((err = register_nfs_fs()) != 0)
                 goto out0;
 
         return 0;
 out0:
-#ifdef CONFIG_NFS_V4
-        exit_nfs_v4();
-out1:
-#endif
 #ifdef CONFIG_PROC_FS
         rpc_proc_unregister(&init_net, "nfs");
 #endif
         nfs_destroy_directcache();
-out2:
+out1:
         nfs_destroy_writepagecache();
-out3:
+out2:
         nfs_destroy_readpagecache();
-out4:
+out3:
         nfs_destroy_inodecache();
-out5:
+out4:
         nfs_destroy_nfspagecache();
-out6:
+out5:
         nfs_fs_proc_exit();
-out7:
+out6:
         nfsiod_stop();
-out8:
+out7:
         nfs_fscache_unregister();
-out9:
+out8:
         unregister_pernet_subsys(&nfs_net_ops);
-out10:
+out9:
         nfs_dns_resolver_destroy();
-out11:
+out10:
         return err;
 }
 
 static void __exit exit_nfs_fs(void)
 {
-#ifdef CONFIG_NFS_V4
-        exit_nfs_v4();
-#endif
         nfs_destroy_directcache();
         nfs_destroy_writepagecache();
         nfs_destroy_readpagecache();