X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fptlrpc%2Fsec_lproc.c;h=04ffd1698ec9f4135b4ca79be8b81428788d7920;hb=d187a78afc960849c3eb86a1a0559c9ba00e8cdf;hp=f7104a93312db4f38d14492055d3accd1c7137de;hpb=a172863af11bcef474191ca40eaa479179457c08;p=fs%2Flustre-release.git

diff --git a/lustre/ptlrpc/sec_lproc.c b/lustre/ptlrpc/sec_lproc.c
index f7104a9..04ffd16 100644
--- a/lustre/ptlrpc/sec_lproc.c
+++ b/lustre/ptlrpc/sec_lproc.c
@@ -15,11 +15,7 @@
  *
  * 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
  */
@@ -82,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);
@@ -103,15 +101,16 @@ 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:
         return 0;
 }
+
 LPROC_SEQ_FOPS_RO(sptlrpc_info_lprocfs);
 
 static int sptlrpc_ctxs_lprocfs_seq_show(struct seq_file *seq, void *v)
@@ -120,9 +119,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);
@@ -136,30 +137,33 @@ static int sptlrpc_ctxs_lprocfs_seq_show(struct seq_file *seq, void *v)
 out:
         return 0;
 }
+
 LPROC_SEQ_FOPS_RO(sptlrpc_ctxs_lprocfs);
 
 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);
+	rc = ldebugfs_seq_create(dev->obd_debugfs_entry, "srpc_info", 0444,
+				 &sptlrpc_info_lprocfs_fops, dev);
         if (rc) {
                 CERROR("create proc entry srpc_info for %s: %d\n",
                        dev->obd_name, rc);
                 return rc;
         }
 
-        rc = lprocfs_obd_seq_create(dev, "srpc_contexts", 0444,
-                                    &sptlrpc_ctxs_lprocfs_fops, dev);
+	rc = ldebugfs_seq_create(dev->obd_debugfs_entry, "srpc_contexts",
+				 0444, &sptlrpc_ctxs_lprocfs_fops, dev);
         if (rc) {
                 CERROR("create proc entry srpc_contexts for %s: %d\n",
                        dev->obd_name, rc);