LU-4423 ptlrpc: use 64-bit times for ptlrpc_sec

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

diff --git a/lustre/ptlrpc/sec_lproc.c b/lustre/ptlrpc/sec_lproc.c
index f3ad3f2..96acb18 100644 (file)
--- a/lustre/ptlrpc/sec_lproc.c
+++ b/lustre/ptlrpc/sec_lproc.c
@@ -15,17 +15,15 @@
  *
  * You should have received a copy of the GNU General Public License
  * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
 /*
  * 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/
@@ -80,9 +78,11 @@ static int sptlrpc_info_lprocfs_seq_show(struct seq_file *seq, void *v)
         struct ptlrpc_sec *sec = NULL;
         char               str[32];
 
-        LASSERT(strcmp(dev->obd_type->typ_name, LUSTRE_OSC_NAME) == 0 ||
-                strcmp(dev->obd_type->typ_name, LUSTRE_MDC_NAME) == 0 ||
-                strcmp(dev->obd_type->typ_name, LUSTRE_MGC_NAME) == 0);
+       LASSERT(strcmp(dev->obd_type->typ_name, LUSTRE_OSC_NAME) == 0 ||
+               strcmp(dev->obd_type->typ_name, LUSTRE_MDC_NAME) == 0 ||
+               strcmp(dev->obd_type->typ_name, LUSTRE_MGC_NAME) == 0 ||
+               strcmp(dev->obd_type->typ_name, LUSTRE_LWP_NAME) == 0 ||
+               strcmp(dev->obd_type->typ_name, LUSTRE_OSP_NAME) == 0);
 
         if (cli->cl_import)
                 sec = sptlrpc_import_sec_ref(cli->cl_import);
@@ -101,10 +101,10 @@ static int sptlrpc_info_lprocfs_seq_show(struct seq_file *seq, void *v)
        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",
+       seq_printf(seq, "gc internal    %lld\n", sec->ps_gc_interval);
+       seq_printf(seq, "gc next        %lld\n",
                   sec->ps_gc_interval ?
-                  sec->ps_gc_next - cfs_time_current_sec() : 0);
+                  (s64)(sec->ps_gc_next - ktime_get_real_seconds()) : 0ll);
 
        sptlrpc_sec_put(sec);
 out:
@@ -118,9 +118,11 @@ static int sptlrpc_ctxs_lprocfs_seq_show(struct seq_file *seq, void *v)
         struct client_obd *cli = &dev->u.cli;
         struct ptlrpc_sec *sec = NULL;
 
-        LASSERT(strcmp(dev->obd_type->typ_name, LUSTRE_OSC_NAME) == 0 ||
-                strcmp(dev->obd_type->typ_name, LUSTRE_MDC_NAME) == 0 ||
-                strcmp(dev->obd_type->typ_name, LUSTRE_MGC_NAME) == 0);
+       LASSERT(strcmp(dev->obd_type->typ_name, LUSTRE_OSC_NAME) == 0 ||
+               strcmp(dev->obd_type->typ_name, LUSTRE_MDC_NAME) == 0 ||
+               strcmp(dev->obd_type->typ_name, LUSTRE_MGC_NAME) == 0 ||
+               strcmp(dev->obd_type->typ_name, LUSTRE_LWP_NAME) == 0 ||
+               strcmp(dev->obd_type->typ_name, LUSTRE_OSP_NAME) == 0);
 
         if (cli->cl_import)
                 sec = sptlrpc_import_sec_ref(cli->cl_import);
@@ -140,13 +142,15 @@ int sptlrpc_lprocfs_cliobd_attach(struct obd_device *dev)
 {
         int     rc;
 
-        if (strcmp(dev->obd_type->typ_name, LUSTRE_OSC_NAME) != 0 &&
-            strcmp(dev->obd_type->typ_name, LUSTRE_MDC_NAME) != 0 &&
-            strcmp(dev->obd_type->typ_name, LUSTRE_MGC_NAME) != 0) {
-                CERROR("can't register lproc for obd type %s\n",
-                       dev->obd_type->typ_name);
-                return -EINVAL;
-        }
+       if (strcmp(dev->obd_type->typ_name, LUSTRE_OSC_NAME) != 0 &&
+           strcmp(dev->obd_type->typ_name, LUSTRE_MDC_NAME) != 0 &&
+           strcmp(dev->obd_type->typ_name, LUSTRE_MGC_NAME) != 0 &&
+           strcmp(dev->obd_type->typ_name, LUSTRE_LWP_NAME) != 0 &&
+           strcmp(dev->obd_type->typ_name, LUSTRE_OSP_NAME) != 0) {
+               CERROR("can't register lproc for obd type %s\n",
+                      dev->obd_type->typ_name);
+               return -EINVAL;
+       }
 
         rc = lprocfs_obd_seq_create(dev, "srpc_info", 0444,
                                     &sptlrpc_info_lprocfs_fops, dev);
@@ -169,7 +173,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 }
@@ -181,8 +185,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;