LU-8030 hsm: prevent duplicated HSM requests

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

diff --git a/lustre/ptlrpc/sec_lproc.c b/lustre/ptlrpc/sec_lproc.c
index e602a63..bf1e961 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/
@@ -55,7 +57,7 @@
 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';
 
@@ -80,9 +82,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);
@@ -118,9 +122,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 +146,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);
@@ -198,4 +206,3 @@ void sptlrpc_lproc_fini(void)
                 sptlrpc_proc_root = NULL;
         }
 }
-