LU-2683 lov: release all locks in closure to release sublock

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

diff --git a/lustre/ptlrpc/gss/gss_mech_switch.c b/lustre/ptlrpc/gss/gss_mech_switch.c
index 6efc695..09449a9 100644 (file)
--- a/lustre/ptlrpc/gss/gss_mech_switch.c
+++ b/lustre/ptlrpc/gss/gss_mech_switch.c
@@ -1,10 +1,10 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * Modifications for Lustre
  *
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  *
+ * Copyright (c) 2012, Intel Corporation.
+ *
  * Author: Eric Mei <ericm@clusterfs.com>
  */
 
@@ -43,9 +43,6 @@
  *
  */
 
-#ifndef EXPORT_SYMTAB
-# define EXPORT_SYMTAB
-#endif
 #define DEBUG_SUBSYSTEM S_SEC
 #ifdef __KERNEL__
 #include <linux/init.h>
@@ -69,23 +66,23 @@
 #include "gss_api.h"
 
 static CFS_LIST_HEAD(registered_mechs);
-static cfs_spinlock_t registered_mechs_lock = CFS_SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(registered_mechs_lock);
 
 int lgss_mech_register(struct gss_api_mech *gm)
 {
-        cfs_spin_lock(&registered_mechs_lock);
-        cfs_list_add(&gm->gm_list, &registered_mechs);
-        cfs_spin_unlock(&registered_mechs_lock);
-        CWARN("Register %s mechanism\n", gm->gm_name);
-        return 0;
+       spin_lock(&registered_mechs_lock);
+       cfs_list_add(&gm->gm_list, &registered_mechs);
+       spin_unlock(&registered_mechs_lock);
+       CWARN("Register %s mechanism\n", gm->gm_name);
+       return 0;
 }
 
 void lgss_mech_unregister(struct gss_api_mech *gm)
 {
-        cfs_spin_lock(&registered_mechs_lock);
-        cfs_list_del(&gm->gm_list);
-        cfs_spin_unlock(&registered_mechs_lock);
-        CWARN("Unregister %s mechanism\n", gm->gm_name);
+       spin_lock(&registered_mechs_lock);
+       cfs_list_del(&gm->gm_list);
+       spin_unlock(&registered_mechs_lock);
+       CWARN("Unregister %s mechanism\n", gm->gm_name);
 }
 
 
@@ -97,19 +94,19 @@ struct gss_api_mech *lgss_mech_get(struct gss_api_mech *gm)
 
 struct gss_api_mech *lgss_name_to_mech(char *name)
 {
-        struct gss_api_mech *pos, *gm = NULL;
-
-        cfs_spin_lock(&registered_mechs_lock);
-        cfs_list_for_each_entry(pos, &registered_mechs, gm_list) {
-                if (0 == strcmp(name, pos->gm_name)) {
-                        if (!cfs_try_module_get(pos->gm_owner))
-                                continue;
-                        gm = pos;
-                        break;
-                }
-        }
-        cfs_spin_unlock(&registered_mechs_lock);
-        return gm;
+       struct gss_api_mech *pos, *gm = NULL;
+
+       spin_lock(&registered_mechs_lock);
+       cfs_list_for_each_entry(pos, &registered_mechs, gm_list) {
+               if (0 == strcmp(name, pos->gm_name)) {
+                       if (!cfs_try_module_get(pos->gm_owner))
+                               continue;
+                       gm = pos;
+                       break;
+               }
+       }
+       spin_unlock(&registered_mechs_lock);
+       return gm;
 
 }
 
@@ -127,9 +124,9 @@ int mech_supports_subflavor(struct gss_api_mech *gm, __u32 subflavor)
 
 struct gss_api_mech *lgss_subflavor_to_mech(__u32 subflavor)
 {
-        struct gss_api_mech *pos, *gm = NULL;
+       struct gss_api_mech *pos, *gm = NULL;
 
-        cfs_spin_lock(&registered_mechs_lock);
+       spin_lock(&registered_mechs_lock);
         cfs_list_for_each_entry(pos, &registered_mechs, gm_list) {
                 if (!cfs_try_module_get(pos->gm_owner))
                         continue;
@@ -140,8 +137,8 @@ struct gss_api_mech *lgss_subflavor_to_mech(__u32 subflavor)
                 gm = pos;
                 break;
         }
-        cfs_spin_unlock(&registered_mechs_lock);
-        return gm;
+       spin_unlock(&registered_mechs_lock);
+       return gm;
 }
 
 void lgss_mech_put(struct gss_api_mech *gm)