LU-6496 ptlrpc: Fix wrong code indentation in plain_authorize

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

diff --git a/lustre/ptlrpc/sec_lproc.c b/lustre/ptlrpc/sec_lproc.c
index 0506d27..f7104a9 100644 (file)
--- a/lustre/ptlrpc/sec_lproc.c
+++ b/lustre/ptlrpc/sec_lproc.c
@@ -26,6 +26,8 @@
 /*
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -39,12 +41,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 +53,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 +93,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;
 }
@@ -174,25 +170,27 @@ 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_vars sptlrpc_lprocfs_vars[] = {
-        { "encrypt_page_pools", sptlrpc_proc_read_enc_pool, NULL, NULL },
-        { NULL }
+       { .name =       "encrypt_page_pools",
+         .fops =       &sptlrpc_proc_enc_pool_fops     },
+       { NULL }
 };
 
 int sptlrpc_lproc_init(void)
 {
-        int     rc;
-
-        LASSERT(sptlrpc_proc_root == 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;
-                return rc;
-        }
-        return 0;
+       int rc;
+
+       LASSERT(sptlrpc_proc_root == 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;
+               return rc;
+       }
+       return 0;
 }
 
 void sptlrpc_lproc_fini(void)
@@ -202,21 +200,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