LU-1538 tests: clarify conf-sanity test_49 failures

[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 974546a..3c5d4ab 100644 (file)
--- a/lustre/ptlrpc/gss/lproc_gss.c
+++ b/lustre/ptlrpc/gss/lproc_gss.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) 2012, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -64,7 +66,7 @@ static struct proc_dir_entry *gss_proc_lk = NULL;
  * statistic of "out-of-sequence-window"
  */
 static struct {
-        cfs_spinlock_t  oos_lock;
+       spinlock_t  oos_lock;
         cfs_atomic_t    oos_cli_count;       /* client occurrence */
         int             oos_cli_behind;      /* client max seqs behind */
         cfs_atomic_t    oos_svc_replay[3];   /* server replay detected */
@@ -78,12 +80,12 @@ static struct {
 
 void gss_stat_oos_record_cli(int behind)
 {
-        cfs_atomic_inc(&gss_stat_oos.oos_cli_count);
+       cfs_atomic_inc(&gss_stat_oos.oos_cli_count);
 
-        cfs_spin_lock(&gss_stat_oos.oos_lock);
-        if (behind > gss_stat_oos.oos_cli_behind)
-                gss_stat_oos.oos_cli_behind = behind;
-        cfs_spin_unlock(&gss_stat_oos.oos_lock);
+       spin_lock(&gss_stat_oos.oos_lock);
+       if (behind > gss_stat_oos.oos_cli_behind)
+               gss_stat_oos.oos_cli_behind = behind;
+       spin_unlock(&gss_stat_oos.oos_lock);
 }
 
 void gss_stat_oos_record_svc(int phase, int replay)
@@ -194,28 +196,31 @@ void gss_exit_lproc(void)
 
 int gss_init_lproc(void)
 {
-        int     rc;
+       int     rc;
 
-        cfs_spin_lock_init(&gss_stat_oos.oos_lock);
+       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_root = lprocfs_register("gss", sptlrpc_proc_root,
+                                        gss_lprocfs_vars, NULL);
+       if (IS_ERR(gss_proc_root)) {
+               rc = PTR_ERR(gss_proc_root);
+               gss_proc_root = NULL;
+               GOTO(out, rc);
+       }
 
-        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));
-        }
+       gss_proc_lk = lprocfs_register("lgss_keyring", gss_proc_root,
+                                      gss_lk_lprocfs_vars, NULL);
+       if (IS_ERR(gss_proc_lk)) {
+               rc = PTR_ERR(gss_proc_lk);
+               gss_proc_lk = NULL;
+               GOTO(out, rc);
+       }
+
+       return 0;
 
-        return 0;
+out:
+       CERROR("failed to initialize gss lproc entries: %d\n", rc);
+       gss_exit_lproc();
 
-err_out:
-        CERROR("failed to initialize gss lproc entries: %d\n", rc);
-        gss_exit_lproc();
-        return rc;
+       return rc;
 }