LU-11775 obdclass: protect imp_sec using rwlock_t

[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 7c5b830..a5eaae2 100644 (file)
--- a/lustre/ptlrpc/gss/gss_mech_switch.c
+++ b/lustre/ptlrpc/gss/gss_mech_switch.c
@@ -44,19 +44,14 @@
  */
 
 #define DEBUG_SUBSYSTEM S_SEC
-#ifdef __KERNEL__
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/mutex.h>
-#else
-#include <liblustre.h>
-#endif
 
 #include <obd.h>
 #include <obd_class.h>
 #include <obd_support.h>
-#include <lustre/lustre_idl.h>
 #include <lustre_net.h>
 #include <lustre_import.h>
 #include <lustre_sec.h>
@@ -65,24 +60,24 @@
 #include "gss_internal.h"
 #include "gss_api.h"
 
-static CFS_LIST_HEAD(registered_mechs);
+static struct list_head registered_mechs = LIST_HEAD_INIT(registered_mechs);
 static DEFINE_SPINLOCK(registered_mechs_lock);
 
 int lgss_mech_register(struct gss_api_mech *gm)
 {
        spin_lock(&registered_mechs_lock);
-       cfs_list_add(&gm->gm_list, &registered_mechs);
+       list_add(&gm->gm_list, &registered_mechs);
        spin_unlock(&registered_mechs_lock);
-       CWARN("Register %s mechanism\n", gm->gm_name);
+       CDEBUG(D_SEC, "register %s mechanism\n", gm->gm_name);
        return 0;
 }
 
 void lgss_mech_unregister(struct gss_api_mech *gm)
 {
        spin_lock(&registered_mechs_lock);
-       cfs_list_del(&gm->gm_list);
+       list_del(&gm->gm_list);
        spin_unlock(&registered_mechs_lock);
-       CWARN("Unregister %s mechanism\n", gm->gm_name);
+       CDEBUG(D_SEC, "Unregister %s mechanism\n", gm->gm_name);
 }
 
 
@@ -97,7 +92,7 @@ struct gss_api_mech *lgss_name_to_mech(char *name)
        struct gss_api_mech *pos, *gm = NULL;
 
        spin_lock(&registered_mechs_lock);
-       cfs_list_for_each_entry(pos, &registered_mechs, gm_list) {
+       list_for_each_entry(pos, &registered_mechs, gm_list) {
                if (0 == strcmp(name, pos->gm_name)) {
                        if (!try_module_get(pos->gm_owner))
                                continue;
@@ -127,7 +122,7 @@ struct gss_api_mech *lgss_subflavor_to_mech(__u32 subflavor)
        struct gss_api_mech *pos, *gm = NULL;
 
        spin_lock(&registered_mechs_lock);
-       cfs_list_for_each_entry(pos, &registered_mechs, gm_list) {
+       list_for_each_entry(pos, &registered_mechs, gm_list) {
                if (!try_module_get(pos->gm_owner))
                        continue;
                if (!mech_supports_subflavor(pos, subflavor)) {
@@ -195,7 +190,7 @@ __u32 lgss_copy_reverse_context(struct gss_ctx *ctx_id,
  * this interface is much simplified, currently we only need endtime.
  */
 __u32 lgss_inquire_context(struct gss_ctx *context_handle,
-                           unsigned long  *endtime)
+                          time64_t *endtime)
 {
         LASSERT(context_handle);
         LASSERT(context_handle->mech_type);
@@ -327,27 +322,27 @@ __u32 lgss_unwrap_bulk(struct gss_ctx *context_handle,
 
 __u32 lgss_delete_sec_context(struct gss_ctx **context_handle)
 {
-        struct gss_api_mech *mech;
+       struct gss_api_mech *mech;
 
-        CDEBUG(D_SEC, "deleting %p\n", *context_handle);
+       if (!*context_handle)
+               return GSS_S_NO_CONTEXT;
 
-        if (!*context_handle)
-                return(GSS_S_NO_CONTEXT);
+       CDEBUG(D_SEC, "deleting %p\n", *context_handle);
 
-        mech = (*context_handle)->mech_type;
-        if ((*context_handle)->internal_ctx_id != 0) {
-                LASSERT(mech);
-                LASSERT(mech->gm_ops);
-                LASSERT(mech->gm_ops->gss_delete_sec_context);
-                mech->gm_ops->gss_delete_sec_context(
-                                        (*context_handle)->internal_ctx_id);
-        }
-        if (mech)
-                lgss_mech_put(mech);
+       mech = (*context_handle)->mech_type;
+       if ((*context_handle)->internal_ctx_id != NULL) {
+               LASSERT(mech);
+               LASSERT(mech->gm_ops);
+               LASSERT(mech->gm_ops->gss_delete_sec_context);
+               mech->gm_ops->gss_delete_sec_context(
+                       (*context_handle)->internal_ctx_id);
+       }
+       if (mech)
+               lgss_mech_put(mech);
 
-        OBD_FREE_PTR(*context_handle);
-        *context_handle=NULL;
-        return GSS_S_COMPLETE;
+       OBD_FREE_PTR(*context_handle);
+       *context_handle = NULL;
+       return GSS_S_COMPLETE;
 }
 
 int lgss_display(struct gss_ctx *ctx,