Merge tag 'core-rcu-2021-02-17' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / fs / nfsd / nfsctl.c

diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c
index 7ae2361..4f6e514 100644 (file)
--- a/fs/nfsd/nfsctl.c
+++ b/fs/nfsd/nfsctl.c
@@ -32,6 +32,7 @@
 enum {
        NFSD_Root = 1,
        NFSD_List,
+       NFSD_Export_Stats,
        NFSD_Export_features,
        NFSD_Fh,
        NFSD_FO_UnlockIP,
@@ -1348,6 +1349,8 @@ static int nfsd_fill_super(struct super_block *sb, struct fs_context *fc)
 
        static const struct tree_descr nfsd_files[] = {
                [NFSD_List] = {"exports", &exports_nfsd_operations, S_IRUGO},
+               /* Per-export io stats use same ops as exports file */
+               [NFSD_Export_Stats] = {"export_stats", &exports_nfsd_operations, S_IRUGO},
                [NFSD_Export_features] = {"export_features",
                                        &export_features_operations, S_IRUGO},
                [NFSD_FO_UnlockIP] = {"unlock_ip",
@@ -1534,8 +1537,9 @@ static int __init init_nfsd(void)
        retval = nfsd4_init_pnfs();
        if (retval)
                goto out_free_slabs;
-       nfsd_fault_inject_init(); /* nfsd fault injection controls */
-       nfsd_stat_init();       /* Statistics */
+       retval = nfsd_stat_init();      /* Statistics */
+       if (retval)
+               goto out_free_pnfs;
        retval = nfsd_drc_slab_create();
        if (retval)
                goto out_free_stat;
@@ -1555,7 +1559,7 @@ out_free_lockd:
        nfsd_drc_slab_free();
 out_free_stat:
        nfsd_stat_shutdown();
-       nfsd_fault_inject_cleanup();
+out_free_pnfs:
        nfsd4_exit_pnfs();
 out_free_slabs:
        nfsd4_free_slabs();
@@ -1575,7 +1579,6 @@ static void __exit exit_nfsd(void)
        nfsd_lockd_shutdown();
        nfsd4_free_slabs();
        nfsd4_exit_pnfs();
-       nfsd_fault_inject_cleanup();
        unregister_filesystem(&nfsd_fs_type);
        unregister_cld_notifier();
        unregister_pernet_subsys(&nfsd_net_ops);