Branch HEAD

[fs/lustre-release.git] / lustre / ptlrpc / gss / lproc_gss.c

diff --git a/lustre/ptlrpc/gss/lproc_gss.c b/lustre/ptlrpc/gss/lproc_gss.c
index 208bad8..489c870 100644 (file)
--- a/lustre/ptlrpc/gss/lproc_gss.c
+++ b/lustre/ptlrpc/gss/lproc_gss.c
@@ -64,6 +64,7 @@
 #include "gss_api.h"
 
 static struct proc_dir_entry *gss_proc_root = NULL;
+static struct proc_dir_entry *gss_proc_lk = NULL;
 
 /*
  * statistic of "out-of-sequence-window"
@@ -75,7 +76,6 @@ static struct {
         atomic_t        oos_svc_replay[3];   /* server replay detected */
         atomic_t        oos_svc_pass[3];     /* server verified ok */
 } gss_stat_oos = {
-        .oos_lock       = SPIN_LOCK_UNLOCKED,
         .oos_cli_count  = ATOMIC_INIT(0),
         .oos_cli_behind = 0,
         .oos_svc_replay = { ATOMIC_INIT(0), },
@@ -147,43 +147,81 @@ static int gss_proc_write_secinit(struct file *file, const char *buffer,
 
 static struct lprocfs_vars gss_lprocfs_vars[] = {
         { "replays", gss_proc_read_oos, NULL },
-        { "init_channel", NULL, gss_proc_write_secinit, NULL },
+        { "init_channel", NULL, gss_proc_write_secinit, NULL, NULL, 0222 },
         { NULL }
 };
 
-int gss_init_lproc(void)
+/*
+ * for userspace helper lgss_keyring.
+ *
+ * debug_level: [0, 4], defined in utils/gss/lgss_utils.h
+ */
+static int gss_lk_debug_level = 1;
+
+static int gss_lk_proc_read_dl(char *page, char **start, off_t off,
+                               int count, int *eof, void *data)
 {
-        struct proc_dir_entry  *ent;
-        int                     rc;
+        return snprintf(page, count, "%u\n", gss_lk_debug_level);
+}
 
-        gss_proc_root = lprocfs_register("gss", sptlrpc_proc_root,
-                                         gss_lprocfs_vars, NULL);
+static int gss_lk_proc_write_dl(struct file *file, const char *buffer,
+                                unsigned long count, void *data)
+{
+        int     val, rc;
 
-        if (IS_ERR(gss_proc_root)) {
-                rc = PTR_ERR(gss_proc_root);
-                gss_proc_root = NULL;
-                CERROR("failed to initialize lproc entries: %d\n", rc);
+        rc = lprocfs_write_helper(buffer, count, &val);
+        if (rc < 0)
                 return rc;
-        }
 
-        /* FIXME
-         * here we should hold proc_subdir_lock which is not exported
-         */
-        ent = gss_proc_root->subdir;
-        while (ent != NULL) {
-                if (strcmp(ent->name, "init_channel") == 0) {
-                        ent->mode |= 0222;
-                        break;
-                }
-        }
-        
-        return 0;
+        if (val < 0 || val > 4)
+                return -ERANGE;
+
+        gss_lk_debug_level = val;
+        return count;
 }
 
+static struct lprocfs_vars gss_lk_lprocfs_vars[] = {
+        { "debug_level", gss_lk_proc_read_dl, gss_lk_proc_write_dl, NULL },
+        { NULL }
+};
+
 void gss_exit_lproc(void)
 {
+        if (gss_proc_lk) {
+                lprocfs_remove(&gss_proc_lk);
+                gss_proc_lk = NULL;
+        }
+
         if (gss_proc_root) {
                 lprocfs_remove(&gss_proc_root);
                 gss_proc_root = NULL;
         }
 }
+
+int gss_init_lproc(void)
+{
+        int     rc;
+
+        spin_lock_init(&gss_stat_oos.oos_lock);
+
+        gss_proc_root = lprocfs_register("gss", sptlrpc_proc_root,
+                                         gss_lprocfs_vars, NULL);
+        if (IS_ERR(gss_proc_root)) {
+                gss_proc_root = NULL;
+                GOTO(err_out, rc = PTR_ERR(gss_proc_root));
+        }
+
+        gss_proc_lk = lprocfs_register("lgss_keyring", gss_proc_root,
+                                       gss_lk_lprocfs_vars, NULL);
+        if (IS_ERR(gss_proc_lk)) {
+                gss_proc_lk = NULL;
+                GOTO(err_out, rc = PTR_ERR(gss_proc_root));
+        }
+
+        return 0;
+
+err_out:
+        CERROR("failed to initialize gss lproc entries: %d\n", rc);
+        gss_exit_lproc();
+        return rc;
+}