X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fptlrpc%2Fsec_lproc.c;h=f3ad3f2b34de98ed66ff436b1ffba916623232ec;hb=d00c924149b5dd042e6fee09ef724013df1b4e14;hp=009c0f0529c6ee23f9699be526f69853f2e2baa1;hpb=fee90a75e11d68f348decd00f698849d085069f2;p=fs%2Flustre-release.git

diff --git a/lustre/ptlrpc/sec_lproc.c b/lustre/ptlrpc/sec_lproc.c
index 009c0f0..f3ad3f2 100644
--- 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,12 +51,11 @@
 
 #include "ptlrpc_internal.h"
 
-#ifdef __KERNEL__
 
 struct proc_dir_entry *sptlrpc_proc_root = NULL;
 EXPORT_SYMBOL(sptlrpc_proc_root);
 
-char *sec_flags2str(unsigned long flags, char *buf, int bufsize)
+static char *sec_flags2str(unsigned long flags, char *buf, int bufsize)
 {
 	buf[0] = '\0';
 
@@ -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;
 }
@@ -204,21 +198,3 @@ void sptlrpc_lproc_fini(void)
                 sptlrpc_proc_root = NULL;
         }
 }
-
-#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