LU-5275 lprocfs: remove last of non seq data structs and functions.

[fs/lustre-release.git] / lustre / ptlrpc / sec_lproc.c

diff --git a/lustre/ptlrpc/sec_lproc.c b/lustre/ptlrpc/sec_lproc.c
index 009c0f0..e602a63 100644 (file)
--- a/lustre/ptlrpc/sec_lproc.c
+++ b/lustre/ptlrpc/sec_lproc.c
@@ -39,12 +39,7 @@
 #define DEBUG_SUBSYSTEM S_SEC
 
 #include <libcfs/libcfs.h>
-#ifndef __KERNEL__
-#include <liblustre.h>
-#include <libcfs/list.h>
-#else
 #include <linux/crypto.h>
-#endif
 
 #include <obd.h>
 #include <obd_class.h>
@@ -56,7 +51,6 @@
 
 #include "ptlrpc_internal.h"
 
-#ifdef __KERNEL__
 
 struct proc_dir_entry *sptlrpc_proc_root = NULL;
 EXPORT_SYMBOL(sptlrpc_proc_root);
@@ -97,22 +91,22 @@ static int sptlrpc_info_lprocfs_seq_show(struct seq_file *seq, void *v)
 
         sec_flags2str(sec->ps_flvr.sf_flags, str, sizeof(str));
 
-        seq_printf(seq, "rpc flavor:    %s\n",
-                   sptlrpc_flavor2name_base(sec->ps_flvr.sf_rpc));
-        seq_printf(seq, "bulk flavor:   %s\n",
-                   sptlrpc_flavor2name_bulk(&sec->ps_flvr, str, sizeof(str)));
-        seq_printf(seq, "flags:         %s\n",
-                   sec_flags2str(sec->ps_flvr.sf_flags, str, sizeof(str)));
-        seq_printf(seq, "id:            %d\n", sec->ps_id);
-        seq_printf(seq, "refcount:      %d\n",
-                   cfs_atomic_read(&sec->ps_refcount));
-        seq_printf(seq, "nctx:          %d\n", cfs_atomic_read(&sec->ps_nctx));
-        seq_printf(seq, "gc internal    %ld\n", sec->ps_gc_interval);
-        seq_printf(seq, "gc next        %ld\n",
-                   sec->ps_gc_interval ?
-                   sec->ps_gc_next - cfs_time_current_sec() : 0);
-
-        sptlrpc_sec_put(sec);
+       seq_printf(seq, "rpc flavor:    %s\n",
+                  sptlrpc_flavor2name_base(sec->ps_flvr.sf_rpc));
+       seq_printf(seq, "bulk flavor:   %s\n",
+                  sptlrpc_flavor2name_bulk(&sec->ps_flvr, str, sizeof(str)));
+       seq_printf(seq, "flags:         %s\n",
+                  sec_flags2str(sec->ps_flvr.sf_flags, str, sizeof(str)));
+       seq_printf(seq, "id:            %d\n", sec->ps_id);
+       seq_printf(seq, "refcount:      %d\n",
+                  atomic_read(&sec->ps_refcount));
+       seq_printf(seq, "nctx:  %d\n", atomic_read(&sec->ps_nctx));
+       seq_printf(seq, "gc internal    %ld\n", sec->ps_gc_interval);
+       seq_printf(seq, "gc next        %ld\n",
+                  sec->ps_gc_interval ?
+                  sec->ps_gc_next - cfs_time_current_sec() : 0);
+
+       sptlrpc_sec_put(sec);
 out:
         return 0;
 }
@@ -175,7 +169,7 @@ int sptlrpc_lprocfs_cliobd_attach(struct obd_device *dev)
 EXPORT_SYMBOL(sptlrpc_lprocfs_cliobd_attach);
 
 LPROC_SEQ_FOPS_RO(sptlrpc_proc_enc_pool);
-static struct lprocfs_seq_vars sptlrpc_lprocfs_vars[] = {
+static struct lprocfs_vars sptlrpc_lprocfs_vars[] = {
        { .name =       "encrypt_page_pools",
          .fops =       &sptlrpc_proc_enc_pool_fops     },
        { NULL }
@@ -187,8 +181,8 @@ int sptlrpc_lproc_init(void)
 
        LASSERT(sptlrpc_proc_root == NULL);
 
-       sptlrpc_proc_root = lprocfs_seq_register("sptlrpc", proc_lustre_root,
-                                                sptlrpc_lprocfs_vars, NULL);
+       sptlrpc_proc_root = lprocfs_register("sptlrpc", proc_lustre_root,
+                                            sptlrpc_lprocfs_vars, NULL);
        if (IS_ERR(sptlrpc_proc_root)) {
                rc = PTR_ERR(sptlrpc_proc_root);
                sptlrpc_proc_root = NULL;
@@ -205,20 +199,3 @@ void sptlrpc_lproc_fini(void)
         }
 }
 
-#else /* !__KERNEL__ */
-
-int sptlrpc_lprocfs_cliobd_attach(struct obd_device *dev)
-{
-        return 0;
-}
-
-int sptlrpc_lproc_init(void)
-{
-        return 0;
-}
-
-void sptlrpc_lproc_fini(void)
-{
-}
-
-#endif