Whamcloud - gitweb
LU-12930 various: use schedule_timeout_*interruptible
[fs/lustre-release.git] / lustre / ptlrpc / sec.c
index 4effd99..5ead685 100644 (file)
  *
  * You should have received a copy of the GNU General Public License
  * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
@@ -27,7 +23,7 @@
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2014, Intel Corporation.
+ * Copyright (c) 2011, 2017, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
 
 #define DEBUG_SUBSYSTEM S_SEC
 
-#include <libcfs/libcfs.h>
+#include <linux/user_namespace.h>
+#include <linux/uidgid.h>
 #include <linux/crypto.h>
 #include <linux/key.h>
 
+#include <libcfs/libcfs.h>
 #include <obd.h>
 #include <obd_class.h>
 #include <obd_support.h>
 
 #include "ptlrpc_internal.h"
 
-/***********************************************
- * policy registers                            *
- ***********************************************/
+static int send_sepol;
+module_param(send_sepol, int, 0644);
+MODULE_PARM_DESC(send_sepol, "Client sends SELinux policy status");
+
+/*
+ * policy registers
+ */
 
 static rwlock_t policy_lock;
 static struct ptlrpc_sec_policy *policies[SPTLRPC_POLICY_MAX] = {
-        NULL,
+       NULL,
 };
 
 int sptlrpc_register_policy(struct ptlrpc_sec_policy *policy)
 {
-        __u16 number = policy->sp_policy;
+       __u16 number = policy->sp_policy;
 
-        LASSERT(policy->sp_name);
-        LASSERT(policy->sp_cops);
-        LASSERT(policy->sp_sops);
+       LASSERT(policy->sp_name);
+       LASSERT(policy->sp_cops);
+       LASSERT(policy->sp_sops);
 
-        if (number >= SPTLRPC_POLICY_MAX)
-                return -EINVAL;
+       if (number >= SPTLRPC_POLICY_MAX)
+               return -EINVAL;
 
        write_lock(&policy_lock);
-        if (unlikely(policies[number])) {
+       if (unlikely(policies[number])) {
                write_unlock(&policy_lock);
-                return -EALREADY;
-        }
-        policies[number] = policy;
+               return -EALREADY;
+       }
+       policies[number] = policy;
        write_unlock(&policy_lock);
 
-        CDEBUG(D_SEC, "%s: registered\n", policy->sp_name);
-        return 0;
+       CDEBUG(D_SEC, "%s: registered\n", policy->sp_name);
+       return 0;
 }
 EXPORT_SYMBOL(sptlrpc_register_policy);
 
 int sptlrpc_unregister_policy(struct ptlrpc_sec_policy *policy)
 {
-        __u16 number = policy->sp_policy;
+       __u16 number = policy->sp_policy;
 
-        LASSERT(number < SPTLRPC_POLICY_MAX);
+       LASSERT(number < SPTLRPC_POLICY_MAX);
 
        write_lock(&policy_lock);
-        if (unlikely(policies[number] == NULL)) {
+       if (unlikely(policies[number] == NULL)) {
                write_unlock(&policy_lock);
-                CERROR("%s: already unregistered\n", policy->sp_name);
-                return -EINVAL;
-        }
+               CERROR("%s: already unregistered\n", policy->sp_name);
+               return -EINVAL;
+       }
 
-        LASSERT(policies[number] == policy);
-        policies[number] = NULL;
+       LASSERT(policies[number] == policy);
+       policies[number] = NULL;
        write_unlock(&policy_lock);
 
-        CDEBUG(D_SEC, "%s: unregistered\n", policy->sp_name);
-        return 0;
+       CDEBUG(D_SEC, "%s: unregistered\n", policy->sp_name);
+       return 0;
 }
 EXPORT_SYMBOL(sptlrpc_unregister_policy);
 
 static
-struct ptlrpc_sec_policy * sptlrpc_wireflavor2policy(__u32 flavor)
+struct ptlrpc_sec_policy *sptlrpc_wireflavor2policy(__u32 flavor)
 {
        static DEFINE_MUTEX(load_mutex);
        static atomic_t           loaded = ATOMIC_INIT(0);
@@ -159,14 +161,18 @@ __u32 sptlrpc_name2flavor_base(const char *name)
                return SPTLRPC_FLVR_PLAIN;
        if (!strcmp(name, "gssnull"))
                return SPTLRPC_FLVR_GSSNULL;
-        if (!strcmp(name, "krb5n"))
-                return SPTLRPC_FLVR_KRB5N;
-        if (!strcmp(name, "krb5a"))
-                return SPTLRPC_FLVR_KRB5A;
-        if (!strcmp(name, "krb5i"))
-                return SPTLRPC_FLVR_KRB5I;
-        if (!strcmp(name, "krb5p"))
-                return SPTLRPC_FLVR_KRB5P;
+       if (!strcmp(name, "krb5n"))
+               return SPTLRPC_FLVR_KRB5N;
+       if (!strcmp(name, "krb5a"))
+               return SPTLRPC_FLVR_KRB5A;
+       if (!strcmp(name, "krb5i"))
+               return SPTLRPC_FLVR_KRB5I;
+       if (!strcmp(name, "krb5p"))
+               return SPTLRPC_FLVR_KRB5P;
+       if (!strcmp(name, "skn"))
+               return SPTLRPC_FLVR_SKN;
+       if (!strcmp(name, "ska"))
+               return SPTLRPC_FLVR_SKA;
        if (!strcmp(name, "ski"))
                return SPTLRPC_FLVR_SKI;
        if (!strcmp(name, "skpi"))
@@ -178,22 +184,26 @@ EXPORT_SYMBOL(sptlrpc_name2flavor_base);
 
 const char *sptlrpc_flavor2name_base(__u32 flvr)
 {
-        __u32   base = SPTLRPC_FLVR_BASE(flvr);
+       __u32   base = SPTLRPC_FLVR_BASE(flvr);
 
-        if (base == SPTLRPC_FLVR_BASE(SPTLRPC_FLVR_NULL))
-                return "null";
-        else if (base == SPTLRPC_FLVR_BASE(SPTLRPC_FLVR_PLAIN))
-                return "plain";
+       if (base == SPTLRPC_FLVR_BASE(SPTLRPC_FLVR_NULL))
+               return "null";
+       else if (base == SPTLRPC_FLVR_BASE(SPTLRPC_FLVR_PLAIN))
+               return "plain";
        else if (base == SPTLRPC_FLVR_BASE(SPTLRPC_FLVR_GSSNULL))
                return "gssnull";
-        else if (base == SPTLRPC_FLVR_BASE(SPTLRPC_FLVR_KRB5N))
-                return "krb5n";
-        else if (base == SPTLRPC_FLVR_BASE(SPTLRPC_FLVR_KRB5A))
-                return "krb5a";
-        else if (base == SPTLRPC_FLVR_BASE(SPTLRPC_FLVR_KRB5I))
-                return "krb5i";
-        else if (base == SPTLRPC_FLVR_BASE(SPTLRPC_FLVR_KRB5P))
-                return "krb5p";
+       else if (base == SPTLRPC_FLVR_BASE(SPTLRPC_FLVR_KRB5N))
+               return "krb5n";
+       else if (base == SPTLRPC_FLVR_BASE(SPTLRPC_FLVR_KRB5A))
+               return "krb5a";
+       else if (base == SPTLRPC_FLVR_BASE(SPTLRPC_FLVR_KRB5I))
+               return "krb5i";
+       else if (base == SPTLRPC_FLVR_BASE(SPTLRPC_FLVR_KRB5P))
+               return "krb5p";
+       else if (base == SPTLRPC_FLVR_BASE(SPTLRPC_FLVR_SKN))
+               return "skn";
+       else if (base == SPTLRPC_FLVR_BASE(SPTLRPC_FLVR_SKA))
+               return "ska";
        else if (base == SPTLRPC_FLVR_BASE(SPTLRPC_FLVR_SKI))
                return "ski";
        else if (base == SPTLRPC_FLVR_BASE(SPTLRPC_FLVR_SKPI))
@@ -205,38 +215,38 @@ const char *sptlrpc_flavor2name_base(__u32 flvr)
 EXPORT_SYMBOL(sptlrpc_flavor2name_base);
 
 char *sptlrpc_flavor2name_bulk(struct sptlrpc_flavor *sf,
-                               char *buf, int bufsize)
+                              char *buf, int bufsize)
 {
-        if (SPTLRPC_FLVR_POLICY(sf->sf_rpc) == SPTLRPC_POLICY_PLAIN)
-                snprintf(buf, bufsize, "hash:%s",
-                         sptlrpc_get_hash_name(sf->u_bulk.hash.hash_alg));
-        else
-                snprintf(buf, bufsize, "%s",
-                         sptlrpc_flavor2name_base(sf->sf_rpc));
+       if (SPTLRPC_FLVR_POLICY(sf->sf_rpc) == SPTLRPC_POLICY_PLAIN)
+               snprintf(buf, bufsize, "hash:%s",
+                       sptlrpc_get_hash_name(sf->u_bulk.hash.hash_alg));
+       else
+               snprintf(buf, bufsize, "%s",
+                       sptlrpc_flavor2name_base(sf->sf_rpc));
 
-        buf[bufsize - 1] = '\0';
-        return buf;
+       buf[bufsize - 1] = '\0';
+       return buf;
 }
 EXPORT_SYMBOL(sptlrpc_flavor2name_bulk);
 
 char *sptlrpc_flavor2name(struct sptlrpc_flavor *sf, char *buf, int bufsize)
 {
-        snprintf(buf, bufsize, "%s", sptlrpc_flavor2name_base(sf->sf_rpc));
+       snprintf(buf, bufsize, "%s", sptlrpc_flavor2name_base(sf->sf_rpc));
 
-        /*
-         * currently we don't support customized bulk specification for
-         * flavors other than plain
-         */
-        if (SPTLRPC_FLVR_POLICY(sf->sf_rpc) == SPTLRPC_POLICY_PLAIN) {
-                char bspec[16];
+       /*
+        * currently we don't support customized bulk specification for
+        * flavors other than plain
+        */
+       if (SPTLRPC_FLVR_POLICY(sf->sf_rpc) == SPTLRPC_POLICY_PLAIN) {
+               char bspec[16];
 
-                bspec[0] = '-';
-                sptlrpc_flavor2name_bulk(sf, &bspec[1], sizeof(bspec) - 1);
-                strncat(buf, bspec, bufsize);
-        }
+               bspec[0] = '-';
+               sptlrpc_flavor2name_bulk(sf, &bspec[1], sizeof(bspec) - 1);
+               strncat(buf, bspec, bufsize);
+       }
 
-        buf[bufsize - 1] = '\0';
-        return buf;
+       buf[bufsize - 1] = '\0';
+       return buf;
 }
 EXPORT_SYMBOL(sptlrpc_flavor2name);
 
@@ -259,27 +269,27 @@ char *sptlrpc_secflags2str(__u32 flags, char *buf, int bufsize)
 }
 EXPORT_SYMBOL(sptlrpc_secflags2str);
 
-/**************************************************
- * client context APIs                            *
- **************************************************/
+/*
+ * client context APIs
+ */
 
 static
 struct ptlrpc_cli_ctx *get_my_ctx(struct ptlrpc_sec *sec)
 {
-        struct vfs_cred vcred;
-        int create = 1, remove_dead = 1;
-
-        LASSERT(sec);
-        LASSERT(sec->ps_policy->sp_cops->lookup_ctx);
+       struct vfs_cred vcred;
+       int create = 1, remove_dead = 1;
 
-        if (sec->ps_flvr.sf_flags & (PTLRPC_SEC_FL_REVERSE |
-                                     PTLRPC_SEC_FL_ROOTONLY)) {
-                vcred.vc_uid = 0;
-                vcred.vc_gid = 0;
-                if (sec->ps_flvr.sf_flags & PTLRPC_SEC_FL_REVERSE) {
-                        create = 0;
-                        remove_dead = 0;
-                }
+       LASSERT(sec);
+       LASSERT(sec->ps_policy->sp_cops->lookup_ctx);
+
+       if (sec->ps_flvr.sf_flags & (PTLRPC_SEC_FL_REVERSE |
+                                    PTLRPC_SEC_FL_ROOTONLY)) {
+               vcred.vc_uid = 0;
+               vcred.vc_gid = 0;
+               if (sec->ps_flvr.sf_flags & PTLRPC_SEC_FL_REVERSE) {
+                       create = 0;
+                       remove_dead = 0;
+               }
        } else {
                vcred.vc_uid = from_kuid(&init_user_ns, current_uid());
                vcred.vc_gid = from_kgid(&init_user_ns, current_gid());
@@ -317,8 +327,8 @@ EXPORT_SYMBOL(sptlrpc_cli_ctx_put);
  */
 void sptlrpc_cli_ctx_expire(struct ptlrpc_cli_ctx *ctx)
 {
-        LASSERT(ctx->cc_ops->die);
-        ctx->cc_ops->die(ctx, 0);
+       LASSERT(ctx->cc_ops->die);
+       ctx->cc_ops->die(ctx, 0);
 }
 EXPORT_SYMBOL(sptlrpc_cli_ctx_expire);
 
@@ -342,30 +352,30 @@ EXPORT_SYMBOL(sptlrpc_cli_ctx_wakeup);
 
 int sptlrpc_cli_ctx_display(struct ptlrpc_cli_ctx *ctx, char *buf, int bufsize)
 {
-        LASSERT(ctx->cc_ops);
+       LASSERT(ctx->cc_ops);
 
-        if (ctx->cc_ops->display == NULL)
-                return 0;
+       if (ctx->cc_ops->display == NULL)
+               return 0;
 
-        return ctx->cc_ops->display(ctx, buf, bufsize);
+       return ctx->cc_ops->display(ctx, buf, bufsize);
 }
 
 static int import_sec_check_expire(struct obd_import *imp)
 {
-       int     adapt = 0;
+       int adapt = 0;
 
-       spin_lock(&imp->imp_lock);
+       write_lock(&imp->imp_sec_lock);
        if (imp->imp_sec_expire &&
-           imp->imp_sec_expire < cfs_time_current_sec()) {
+           imp->imp_sec_expire < ktime_get_real_seconds()) {
                adapt = 1;
                imp->imp_sec_expire = 0;
        }
-       spin_unlock(&imp->imp_lock);
+       write_unlock(&imp->imp_sec_lock);
 
-        if (!adapt)
-                return 0;
+       if (!adapt)
+               return 0;
 
-        CDEBUG(D_SEC, "found delayed sec adapt expired, do it now\n");
+       CDEBUG(D_SEC, "found delayed sec adapt expired, do it now\n");
        return sptlrpc_import_sec_adapt(imp, NULL, NULL);
 }
 
@@ -385,7 +395,7 @@ static int import_sec_check_expire(struct obd_import *imp)
 static int import_sec_validate_get(struct obd_import *imp,
                                   struct ptlrpc_sec **sec)
 {
-       int     rc;
+       int rc;
 
        if (unlikely(imp->imp_sec_expire)) {
                rc = import_sec_check_expire(imp);
@@ -394,11 +404,9 @@ static int import_sec_validate_get(struct obd_import *imp,
        }
 
        *sec = sptlrpc_import_sec_ref(imp);
-       /* Only output an error when the import is still active */
        if (*sec == NULL) {
-               if (list_empty(&imp->imp_zombie_chain))
-                       CERROR("import %p (%s) with no sec\n",
-                               imp, ptlrpc_import_state_name(imp->imp_state));
+               CERROR("import %p (%s) with no sec\n",
+                       imp, ptlrpc_import_state_name(imp->imp_state));
                return -EACCES;
        }
 
@@ -412,7 +420,7 @@ static int import_sec_validate_get(struct obd_import *imp,
 }
 
 /**
- * Given a \a req, find or allocate a appropriate context for it.
+ * Given a \a req, find or allocate an appropriate context for it.
  * \pre req->rq_cli_ctx == NULL.
  *
  * \retval 0 succeed, and req->rq_cli_ctx is set.
@@ -420,28 +428,29 @@ static int import_sec_validate_get(struct obd_import *imp,
  */
 int sptlrpc_req_get_ctx(struct ptlrpc_request *req)
 {
-        struct obd_import *imp = req->rq_import;
-        struct ptlrpc_sec *sec;
-        int                rc;
-        ENTRY;
+       struct obd_import *imp = req->rq_import;
+       struct ptlrpc_sec *sec;
+       int rc;
+
+       ENTRY;
 
-        LASSERT(!req->rq_cli_ctx);
-        LASSERT(imp);
+       LASSERT(!req->rq_cli_ctx);
+       LASSERT(imp);
 
-        rc = import_sec_validate_get(imp, &sec);
-        if (rc)
-                RETURN(rc);
+       rc = import_sec_validate_get(imp, &sec);
+       if (rc)
+               RETURN(rc);
 
-        req->rq_cli_ctx = get_my_ctx(sec);
+       req->rq_cli_ctx = get_my_ctx(sec);
 
-        sptlrpc_sec_put(sec);
+       sptlrpc_sec_put(sec);
 
        if (!req->rq_cli_ctx) {
                CERROR("req %p: fail to get context\n", req);
                RETURN(-ECONNREFUSED);
        }
 
-        RETURN(0);
+       RETURN(0);
 }
 
 /**
@@ -455,83 +464,87 @@ int sptlrpc_req_get_ctx(struct ptlrpc_request *req)
  */
 void sptlrpc_req_put_ctx(struct ptlrpc_request *req, int sync)
 {
-        ENTRY;
+       ENTRY;
 
-        LASSERT(req);
-        LASSERT(req->rq_cli_ctx);
+       LASSERT(req);
+       LASSERT(req->rq_cli_ctx);
 
-        /* request might be asked to release earlier while still
-         * in the context waiting list.
-         */
+       /*
+        * request might be asked to release earlier while still
+        * in the context waiting list.
+        */
        if (!list_empty(&req->rq_ctx_chain)) {
                spin_lock(&req->rq_cli_ctx->cc_lock);
                list_del_init(&req->rq_ctx_chain);
                spin_unlock(&req->rq_cli_ctx->cc_lock);
-        }
+       }
 
-        sptlrpc_cli_ctx_put(req->rq_cli_ctx, sync);
-        req->rq_cli_ctx = NULL;
-        EXIT;
+       sptlrpc_cli_ctx_put(req->rq_cli_ctx, sync);
+       req->rq_cli_ctx = NULL;
+       EXIT;
 }
 
 static
 int sptlrpc_req_ctx_switch(struct ptlrpc_request *req,
-                           struct ptlrpc_cli_ctx *oldctx,
-                           struct ptlrpc_cli_ctx *newctx)
-{
-        struct sptlrpc_flavor   old_flvr;
-        char                   *reqmsg = NULL; /* to workaround old gcc */
-        int                     reqmsg_size;
-        int                     rc = 0;
-
-        LASSERT(req->rq_reqmsg);
-        LASSERT(req->rq_reqlen);
-        LASSERT(req->rq_replen);
-
-        CDEBUG(D_SEC, "req %p: switch ctx %p(%u->%s) -> %p(%u->%s), "
-               "switch sec %p(%s) -> %p(%s)\n", req,
-               oldctx, oldctx->cc_vcred.vc_uid, sec2target_str(oldctx->cc_sec),
-               newctx, newctx->cc_vcred.vc_uid, sec2target_str(newctx->cc_sec),
-               oldctx->cc_sec, oldctx->cc_sec->ps_policy->sp_name,
-               newctx->cc_sec, newctx->cc_sec->ps_policy->sp_name);
-
-        /* save flavor */
-        old_flvr = req->rq_flvr;
-
-        /* save request message */
-        reqmsg_size = req->rq_reqlen;
-        if (reqmsg_size != 0) {
-                OBD_ALLOC_LARGE(reqmsg, reqmsg_size);
-                if (reqmsg == NULL)
-                        return -ENOMEM;
-                memcpy(reqmsg, req->rq_reqmsg, reqmsg_size);
-        }
-
-        /* release old req/rep buf */
-        req->rq_cli_ctx = oldctx;
-        sptlrpc_cli_free_reqbuf(req);
-        sptlrpc_cli_free_repbuf(req);
-        req->rq_cli_ctx = newctx;
-
-        /* recalculate the flavor */
-        sptlrpc_req_set_flavor(req, 0);
-
-        /* alloc new request buffer
-         * we don't need to alloc reply buffer here, leave it to the
-         * rest procedure of ptlrpc */
-        if (reqmsg_size != 0) {
-                rc = sptlrpc_cli_alloc_reqbuf(req, reqmsg_size);
-                if (!rc) {
-                        LASSERT(req->rq_reqmsg);
-                        memcpy(req->rq_reqmsg, reqmsg, reqmsg_size);
-                } else {
-                        CWARN("failed to alloc reqbuf: %d\n", rc);
-                        req->rq_flvr = old_flvr;
-                }
-
-                OBD_FREE_LARGE(reqmsg, reqmsg_size);
-        }
-        return rc;
+                          struct ptlrpc_cli_ctx *oldctx,
+                          struct ptlrpc_cli_ctx *newctx)
+{
+       struct sptlrpc_flavor   old_flvr;
+       char *reqmsg = NULL; /* to workaround old gcc */
+       int reqmsg_size;
+       int rc = 0;
+
+       LASSERT(req->rq_reqmsg);
+       LASSERT(req->rq_reqlen);
+       LASSERT(req->rq_replen);
+
+       CDEBUG(D_SEC,
+              "req %p: switch ctx %p(%u->%s) -> %p(%u->%s), switch sec %p(%s) -> %p(%s)\n",
+              req, oldctx, oldctx->cc_vcred.vc_uid,
+              sec2target_str(oldctx->cc_sec), newctx, newctx->cc_vcred.vc_uid,
+              sec2target_str(newctx->cc_sec), oldctx->cc_sec,
+              oldctx->cc_sec->ps_policy->sp_name, newctx->cc_sec,
+              newctx->cc_sec->ps_policy->sp_name);
+
+       /* save flavor */
+       old_flvr = req->rq_flvr;
+
+       /* save request message */
+       reqmsg_size = req->rq_reqlen;
+       if (reqmsg_size != 0) {
+               OBD_ALLOC_LARGE(reqmsg, reqmsg_size);
+               if (reqmsg == NULL)
+                       return -ENOMEM;
+               memcpy(reqmsg, req->rq_reqmsg, reqmsg_size);
+       }
+
+       /* release old req/rep buf */
+       req->rq_cli_ctx = oldctx;
+       sptlrpc_cli_free_reqbuf(req);
+       sptlrpc_cli_free_repbuf(req);
+       req->rq_cli_ctx = newctx;
+
+       /* recalculate the flavor */
+       sptlrpc_req_set_flavor(req, 0);
+
+       /*
+        * alloc new request buffer
+        * we don't need to alloc reply buffer here, leave it to the
+        * rest procedure of ptlrpc
+        */
+       if (reqmsg_size != 0) {
+               rc = sptlrpc_cli_alloc_reqbuf(req, reqmsg_size);
+               if (!rc) {
+                       LASSERT(req->rq_reqmsg);
+                       memcpy(req->rq_reqmsg, reqmsg, reqmsg_size);
+               } else {
+                       CWARN("failed to alloc reqbuf: %d\n", rc);
+                       req->rq_flvr = old_flvr;
+               }
+
+               OBD_FREE_LARGE(reqmsg, reqmsg_size);
+       }
+       return rc;
 }
 
 /**
@@ -544,93 +557,100 @@ int sptlrpc_req_ctx_switch(struct ptlrpc_request *req,
  */
 int sptlrpc_req_replace_dead_ctx(struct ptlrpc_request *req)
 {
-        struct ptlrpc_cli_ctx *oldctx = req->rq_cli_ctx;
-        struct ptlrpc_cli_ctx *newctx;
-        int                    rc;
-        ENTRY;
+       struct ptlrpc_cli_ctx *oldctx = req->rq_cli_ctx;
+       struct ptlrpc_cli_ctx *newctx;
+       int rc;
+
+       ENTRY;
 
-        LASSERT(oldctx);
+       LASSERT(oldctx);
 
-        sptlrpc_cli_ctx_get(oldctx);
-        sptlrpc_req_put_ctx(req, 0);
+       sptlrpc_cli_ctx_get(oldctx);
+       sptlrpc_req_put_ctx(req, 0);
 
-        rc = sptlrpc_req_get_ctx(req);
-        if (unlikely(rc)) {
-                LASSERT(!req->rq_cli_ctx);
+       rc = sptlrpc_req_get_ctx(req);
+       if (unlikely(rc)) {
+               LASSERT(!req->rq_cli_ctx);
 
-                /* restore old ctx */
-                req->rq_cli_ctx = oldctx;
-                RETURN(rc);
-        }
+               /* restore old ctx */
+               req->rq_cli_ctx = oldctx;
+               RETURN(rc);
+       }
 
-        newctx = req->rq_cli_ctx;
-        LASSERT(newctx);
+       newctx = req->rq_cli_ctx;
+       LASSERT(newctx);
 
-        if (unlikely(newctx == oldctx && 
+       if (unlikely(newctx == oldctx &&
                     test_bit(PTLRPC_CTX_DEAD_BIT, &oldctx->cc_flags))) {
-                /*
-                 * still get the old dead ctx, usually means system too busy
-                 */
-                CDEBUG(D_SEC,
-                       "ctx (%p, fl %lx) doesn't switch, relax a little bit\n",
-                       newctx, newctx->cc_flags);
-
-               schedule_timeout_and_set_state(TASK_INTERRUPTIBLE,
-                       msecs_to_jiffies(MSEC_PER_SEC));
+               /*
+                * still get the old dead ctx, usually means system too busy
+                */
+               CDEBUG(D_SEC,
+                      "ctx (%p, fl %lx) doesn't switch, relax a little bit\n",
+                      newctx, newctx->cc_flags);
+
+               schedule_timeout_interruptible(cfs_time_seconds(1));
+       } else if (unlikely(test_bit(PTLRPC_CTX_UPTODATE_BIT, &newctx->cc_flags)
+                           == 0)) {
+               /*
+                * new ctx not up to date yet
+                */
+               CDEBUG(D_SEC,
+                      "ctx (%p, fl %lx) doesn't switch, not up to date yet\n",
+                      newctx, newctx->cc_flags);
        } else {
-                /*
-                 * it's possible newctx == oldctx if we're switching
-                 * subflavor with the same sec.
-                 */
-                rc = sptlrpc_req_ctx_switch(req, oldctx, newctx);
-                if (rc) {
-                        /* restore old ctx */
-                        sptlrpc_req_put_ctx(req, 0);
-                        req->rq_cli_ctx = oldctx;
-                        RETURN(rc);
-                }
-
-                LASSERT(req->rq_cli_ctx == newctx);
-        }
-
-        sptlrpc_cli_ctx_put(oldctx, 1);
-        RETURN(0);
+               /*
+                * it's possible newctx == oldctx if we're switching
+                * subflavor with the same sec.
+                */
+               rc = sptlrpc_req_ctx_switch(req, oldctx, newctx);
+               if (rc) {
+                       /* restore old ctx */
+                       sptlrpc_req_put_ctx(req, 0);
+                       req->rq_cli_ctx = oldctx;
+                       RETURN(rc);
+               }
+
+               LASSERT(req->rq_cli_ctx == newctx);
+       }
+
+       sptlrpc_cli_ctx_put(oldctx, 1);
+       RETURN(0);
 }
 EXPORT_SYMBOL(sptlrpc_req_replace_dead_ctx);
 
 static
 int ctx_check_refresh(struct ptlrpc_cli_ctx *ctx)
 {
-        if (cli_ctx_is_refreshed(ctx))
-                return 1;
-        return 0;
+       if (cli_ctx_is_refreshed(ctx))
+               return 1;
+       return 0;
 }
 
 static
-int ctx_refresh_timeout(void *data)
+int ctx_refresh_timeout(struct ptlrpc_request *req)
 {
-        struct ptlrpc_request *req = data;
-        int rc;
+       int rc;
 
-        /* conn_cnt is needed in expire_one_request */
-        lustre_msg_set_conn_cnt(req->rq_reqmsg, req->rq_import->imp_conn_cnt);
+       /* conn_cnt is needed in expire_one_request */
+       lustre_msg_set_conn_cnt(req->rq_reqmsg, req->rq_import->imp_conn_cnt);
 
-        rc = ptlrpc_expire_one_request(req, 1);
-        /* if we started recovery, we should mark this ctx dead; otherwise
-         * in case of lgssd died nobody would retire this ctx, following
-         * connecting will still find the same ctx thus cause deadlock.
-         * there's an assumption that expire time of the request should be
-         * later than the context refresh expire time.
-         */
-        if (rc == 0)
-                req->rq_cli_ctx->cc_ops->die(req->rq_cli_ctx, 0);
-        return rc;
+       rc = ptlrpc_expire_one_request(req, 1);
+       /*
+        * if we started recovery, we should mark this ctx dead; otherwise
+        * in case of lgssd died nobody would retire this ctx, following
+        * connecting will still find the same ctx thus cause deadlock.
+        * there's an assumption that expire time of the request should be
+        * later than the context refresh expire time.
+        */
+       if (rc == 0)
+               req->rq_cli_ctx->cc_ops->die(req->rq_cli_ctx, 0);
+       return rc;
 }
 
 static
-void ctx_refresh_interrupt(void *data)
+void ctx_refresh_interrupt(struct ptlrpc_request *req)
 {
-       struct ptlrpc_request *req = data;
 
        spin_lock(&req->rq_lock);
        req->rq_intr = 1;
@@ -662,86 +682,86 @@ void req_off_ctx_list(struct ptlrpc_request *req, struct ptlrpc_cli_ctx *ctx)
  */
 int sptlrpc_req_refresh_ctx(struct ptlrpc_request *req, long timeout)
 {
-        struct ptlrpc_cli_ctx  *ctx = req->rq_cli_ctx;
-        struct ptlrpc_sec      *sec;
-        struct l_wait_info      lwi;
-        int                     rc;
-        ENTRY;
+       struct ptlrpc_cli_ctx *ctx = req->rq_cli_ctx;
+       struct ptlrpc_sec *sec;
+       int rc;
 
-        LASSERT(ctx);
+       ENTRY;
 
-        if (req->rq_ctx_init || req->rq_ctx_fini)
-                RETURN(0);
+       LASSERT(ctx);
 
-        /*
-         * during the process a request's context might change type even
-         * (e.g. from gss ctx to null ctx), so each loop we need to re-check
-         * everything
-         */
+       if (req->rq_ctx_init || req->rq_ctx_fini)
+               RETURN(0);
+
+       /*
+        * during the process a request's context might change type even
+        * (e.g. from gss ctx to null ctx), so each loop we need to re-check
+        * everything
+        */
 again:
-        rc = import_sec_validate_get(req->rq_import, &sec);
-        if (rc)
-                RETURN(rc);
-
-        if (sec->ps_flvr.sf_rpc != req->rq_flvr.sf_rpc) {
-                CDEBUG(D_SEC, "req %p: flavor has changed %x -> %x\n",
-                      req, req->rq_flvr.sf_rpc, sec->ps_flvr.sf_rpc);
-                req_off_ctx_list(req, ctx);
-                sptlrpc_req_replace_dead_ctx(req);
-                ctx = req->rq_cli_ctx;
-        }
-        sptlrpc_sec_put(sec);
-
-        if (cli_ctx_is_eternal(ctx))
-                RETURN(0);
+       rc = import_sec_validate_get(req->rq_import, &sec);
+       if (rc)
+               RETURN(rc);
+
+       if (sec->ps_flvr.sf_rpc != req->rq_flvr.sf_rpc) {
+               CDEBUG(D_SEC, "req %p: flavor has changed %x -> %x\n",
+                      req, req->rq_flvr.sf_rpc, sec->ps_flvr.sf_rpc);
+               req_off_ctx_list(req, ctx);
+               sptlrpc_req_replace_dead_ctx(req);
+               ctx = req->rq_cli_ctx;
+       }
+       sptlrpc_sec_put(sec);
+
+       if (cli_ctx_is_eternal(ctx))
+               RETURN(0);
 
        if (unlikely(test_bit(PTLRPC_CTX_NEW_BIT, &ctx->cc_flags))) {
-                LASSERT(ctx->cc_ops->refresh);
-                ctx->cc_ops->refresh(ctx);
-        }
+               LASSERT(ctx->cc_ops->refresh);
+               ctx->cc_ops->refresh(ctx);
+       }
        LASSERT(test_bit(PTLRPC_CTX_NEW_BIT, &ctx->cc_flags) == 0);
 
-        LASSERT(ctx->cc_ops->validate);
-        if (ctx->cc_ops->validate(ctx) == 0) {
-                req_off_ctx_list(req, ctx);
-                RETURN(0);
-        }
+       LASSERT(ctx->cc_ops->validate);
+       if (ctx->cc_ops->validate(ctx) == 0) {
+               req_off_ctx_list(req, ctx);
+               RETURN(0);
+       }
 
        if (unlikely(test_bit(PTLRPC_CTX_ERROR_BIT, &ctx->cc_flags))) {
                spin_lock(&req->rq_lock);
                req->rq_err = 1;
                spin_unlock(&req->rq_lock);
-                req_off_ctx_list(req, ctx);
-                RETURN(-EPERM);
-        }
-
-        /*
-         * There's a subtle issue for resending RPCs, suppose following
-         * situation:
-         *  1. the request was sent to server.
-         *  2. recovery was kicked start, after finished the request was
-         *     marked as resent.
-         *  3. resend the request.
-         *  4. old reply from server received, we accept and verify the reply.
-         *     this has to be success, otherwise the error will be aware
-         *     by application.
-         *  5. new reply from server received, dropped by LNet.
-         *
-         * Note the xid of old & new request is the same. We can't simply
-         * change xid for the resent request because the server replies on
-         * it for reply reconstruction.
-         *
-         * Commonly the original context should be uptodate because we
-         * have a expiry nice time; server will keep its context because
-         * we at least hold a ref of old context which prevent context
-         * destroying RPC being sent. So server still can accept the request
-         * and finish the RPC. But if that's not the case:
-         *  1. If server side context has been trimmed, a NO_CONTEXT will
-         *     be returned, gss_cli_ctx_verify/unseal will switch to new
-         *     context by force.
-         *  2. Current context never be refreshed, then we are fine: we
-         *     never really send request with old context before.
-         */
+               req_off_ctx_list(req, ctx);
+               RETURN(-EPERM);
+       }
+
+       /*
+        * There's a subtle issue for resending RPCs, suppose following
+        * situation:
+        *  1. the request was sent to server.
+        *  2. recovery was kicked start, after finished the request was
+        *     marked as resent.
+        *  3. resend the request.
+        *  4. old reply from server received, we accept and verify the reply.
+        *     this has to be success, otherwise the error will be aware
+        *     by application.
+        *  5. new reply from server received, dropped by LNet.
+        *
+        * Note the xid of old & new request is the same. We can't simply
+        * change xid for the resent request because the server replies on
+        * it for reply reconstruction.
+        *
+        * Commonly the original context should be uptodate because we
+        * have an expiry nice time; server will keep its context because
+        * we at least hold a ref of old context which prevent context
+        * from destroying RPC being sent. So server still can accept the
+        * request and finish the RPC. But if that's not the case:
+        *  1. If server side context has been trimmed, a NO_CONTEXT will
+        *     be returned, gss_cli_ctx_verify/unseal will switch to new
+        *     context by force.
+        *  2. Current context never be refreshed, then we are fine: we
+        *     never really send request with old context before.
+        */
        if (test_bit(PTLRPC_CTX_UPTODATE_BIT, &ctx->cc_flags) &&
            unlikely(req->rq_reqmsg) &&
            lustre_msg_get_flags(req->rq_reqmsg) & MSG_RESENT) {
@@ -769,17 +789,17 @@ again:
                        spin_lock(&req->rq_lock);
                        req->rq_err = 1;
                        spin_unlock(&req->rq_lock);
-                        RETURN(rc);
-                }
+                       RETURN(rc);
+               }
 
-                ctx = req->rq_cli_ctx;
-                goto again;
-        }
+               ctx = req->rq_cli_ctx;
+               goto again;
+       }
 
-        /*
-         * Now we're sure this context is during upcall, add myself into
-         * waiting list
-         */
+       /*
+        * Now we're sure this context is during upcall, add myself into
+        * waiting list
+        */
        spin_lock(&ctx->cc_lock);
        if (list_empty(&req->rq_ctx_chain))
                list_add(&req->rq_ctx_chain, &ctx->cc_req_list);
@@ -797,30 +817,38 @@ again:
        req->rq_restart = 0;
        spin_unlock(&req->rq_lock);
 
-       lwi = LWI_TIMEOUT_INTR(msecs_to_jiffies(timeout * MSEC_PER_SEC),
-                              ctx_refresh_timeout,
-                              ctx_refresh_interrupt, req);
-       rc = l_wait_event(req->rq_reply_waitq, ctx_check_refresh(ctx), &lwi);
+       if (wait_event_idle_timeout(req->rq_reply_waitq,
+                                   ctx_check_refresh(ctx),
+                                   cfs_time_seconds(timeout)) == 0) {
+               rc = -ETIMEDOUT;
+               if (!ctx_refresh_timeout(req) &&
+                   l_wait_event_abortable(req->rq_reply_waitq,
+                                          ctx_check_refresh(ctx))
+                   == -ERESTARTSYS) {
+                       rc = -EINTR;
+                       ctx_refresh_interrupt(req);
+               }
+       }
 
-        /*
-         * following cases could lead us here:
-         * - successfully refreshed;
-         * - interrupted;
-         * - timedout, and we don't want recover from the failure;
-         * - timedout, and waked up upon recovery finished;
-         * - someone else mark this ctx dead by force;
-         * - someone invalidate the req and call ptlrpc_client_wake_req(),
-         *   e.g. ptlrpc_abort_inflight();
-         */
-        if (!cli_ctx_is_refreshed(ctx)) {
-                /* timed out or interruptted */
-                req_off_ctx_list(req, ctx);
+       /*
+        * following cases could lead us here:
+        * - successfully refreshed;
+        * - interrupted;
+        * - timedout, and we don't want recover from the failure;
+        * - timedout, and waked up upon recovery finished;
+        * - someone else mark this ctx dead by force;
+        * - someone invalidate the req and call ptlrpc_client_wake_req(),
+        *   e.g. ptlrpc_abort_inflight();
+        */
+       if (!cli_ctx_is_refreshed(ctx)) {
+               /* timed out or interruptted */
+               req_off_ctx_list(req, ctx);
 
-                LASSERT(rc != 0);
-                RETURN(rc);
-        }
+               LASSERT(rc != 0);
+               RETURN(rc);
+       }
 
-        goto again;
+       goto again;
 }
 
 /**
@@ -832,78 +860,80 @@ again:
  */
 void sptlrpc_req_set_flavor(struct ptlrpc_request *req, int opcode)
 {
-        struct ptlrpc_sec *sec;
+       struct ptlrpc_sec *sec;
 
-        LASSERT(req->rq_import);
-        LASSERT(req->rq_cli_ctx);
-        LASSERT(req->rq_cli_ctx->cc_sec);
-        LASSERT(req->rq_bulk_read == 0 || req->rq_bulk_write == 0);
+       LASSERT(req->rq_import);
+       LASSERT(req->rq_cli_ctx);
+       LASSERT(req->rq_cli_ctx->cc_sec);
+       LASSERT(req->rq_bulk_read == 0 || req->rq_bulk_write == 0);
 
-        /* special security flags accoding to opcode */
-        switch (opcode) {
-        case OST_READ:
-        case MDS_READPAGE:
-        case MGS_CONFIG_READ:
+       /* special security flags according to opcode */
+       switch (opcode) {
+       case OST_READ:
+       case MDS_READPAGE:
+       case MGS_CONFIG_READ:
        case OBD_IDX_READ:
-                req->rq_bulk_read = 1;
-                break;
-        case OST_WRITE:
-        case MDS_WRITEPAGE:
-                req->rq_bulk_write = 1;
-                break;
-        case SEC_CTX_INIT:
-                req->rq_ctx_init = 1;
-                break;
-        case SEC_CTX_FINI:
-                req->rq_ctx_fini = 1;
-                break;
-        case 0:
-                /* init/fini rpc won't be resend, so can't be here */
-                LASSERT(req->rq_ctx_init == 0);
-                LASSERT(req->rq_ctx_fini == 0);
-
-                /* cleanup flags, which should be recalculated */
-                req->rq_pack_udesc = 0;
-                req->rq_pack_bulk = 0;
-                break;
-        }
-
-        sec = req->rq_cli_ctx->cc_sec;
+               req->rq_bulk_read = 1;
+               break;
+       case OST_WRITE:
+       case MDS_WRITEPAGE:
+               req->rq_bulk_write = 1;
+               break;
+       case SEC_CTX_INIT:
+               req->rq_ctx_init = 1;
+               break;
+       case SEC_CTX_FINI:
+               req->rq_ctx_fini = 1;
+               break;
+       case 0:
+               /* init/fini rpc won't be resend, so can't be here */
+               LASSERT(req->rq_ctx_init == 0);
+               LASSERT(req->rq_ctx_fini == 0);
+
+               /* cleanup flags, which should be recalculated */
+               req->rq_pack_udesc = 0;
+               req->rq_pack_bulk = 0;
+               break;
+       }
+
+       sec = req->rq_cli_ctx->cc_sec;
 
        spin_lock(&sec->ps_lock);
        req->rq_flvr = sec->ps_flvr;
        spin_unlock(&sec->ps_lock);
 
-        /* force SVC_NULL for context initiation rpc, SVC_INTG for context
-         * destruction rpc */
-        if (unlikely(req->rq_ctx_init))
-                flvr_set_svc(&req->rq_flvr.sf_rpc, SPTLRPC_SVC_NULL);
-        else if (unlikely(req->rq_ctx_fini))
-                flvr_set_svc(&req->rq_flvr.sf_rpc, SPTLRPC_SVC_INTG);
+       /*
+        * force SVC_NULL for context initiation rpc, SVC_INTG for context
+        * destruction rpc
+        */
+       if (unlikely(req->rq_ctx_init))
+               flvr_set_svc(&req->rq_flvr.sf_rpc, SPTLRPC_SVC_NULL);
+       else if (unlikely(req->rq_ctx_fini))
+               flvr_set_svc(&req->rq_flvr.sf_rpc, SPTLRPC_SVC_INTG);
 
-        /* user descriptor flag, null security can't do it anyway */
-        if ((sec->ps_flvr.sf_flags & PTLRPC_SEC_FL_UDESC) &&
-            (req->rq_flvr.sf_rpc != SPTLRPC_FLVR_NULL))
-                req->rq_pack_udesc = 1;
+       /* user descriptor flag, null security can't do it anyway */
+       if ((sec->ps_flvr.sf_flags & PTLRPC_SEC_FL_UDESC) &&
+           (req->rq_flvr.sf_rpc != SPTLRPC_FLVR_NULL))
+               req->rq_pack_udesc = 1;
 
-        /* bulk security flag */
-        if ((req->rq_bulk_read || req->rq_bulk_write) &&
-            sptlrpc_flavor_has_bulk(&req->rq_flvr))
-                req->rq_pack_bulk = 1;
+       /* bulk security flag */
+       if ((req->rq_bulk_read || req->rq_bulk_write) &&
+           sptlrpc_flavor_has_bulk(&req->rq_flvr))
+               req->rq_pack_bulk = 1;
 }
 
 void sptlrpc_request_out_callback(struct ptlrpc_request *req)
 {
-        if (SPTLRPC_FLVR_SVC(req->rq_flvr.sf_rpc) != SPTLRPC_SVC_PRIV)
-                return;
+       if (SPTLRPC_FLVR_SVC(req->rq_flvr.sf_rpc) != SPTLRPC_SVC_PRIV)
+               return;
 
-        LASSERT(req->rq_clrbuf);
-        if (req->rq_pool || !req->rq_reqbuf)
-                return;
+       LASSERT(req->rq_clrbuf);
+       if (req->rq_pool || !req->rq_reqbuf)
+               return;
 
-        OBD_FREE(req->rq_reqbuf, req->rq_reqbuf_len);
-        req->rq_reqbuf = NULL;
-        req->rq_reqbuf_len = 0;
+       OBD_FREE(req->rq_reqbuf, req->rq_reqbuf_len);
+       req->rq_reqbuf = NULL;
+       req->rq_reqbuf_len = 0;
 }
 
 /**
@@ -917,6 +947,7 @@ int sptlrpc_import_check_ctx(struct obd_import *imp)
        struct ptlrpc_cli_ctx *ctx;
        struct ptlrpc_request *req = NULL;
        int rc;
+
        ENTRY;
 
        might_sleep();
@@ -925,19 +956,19 @@ int sptlrpc_import_check_ctx(struct obd_import *imp)
        ctx = get_my_ctx(sec);
        sptlrpc_sec_put(sec);
 
-        if (!ctx)
-                RETURN(-ENOMEM);
+       if (!ctx)
+               RETURN(-ENOMEM);
 
-        if (cli_ctx_is_eternal(ctx) ||
-            ctx->cc_ops->validate(ctx) == 0) {
-                sptlrpc_cli_ctx_put(ctx, 1);
-                RETURN(0);
-        }
+       if (cli_ctx_is_eternal(ctx) ||
+           ctx->cc_ops->validate(ctx) == 0) {
+               sptlrpc_cli_ctx_put(ctx, 1);
+               RETURN(0);
+       }
 
-        if (cli_ctx_is_error(ctx)) {
-                sptlrpc_cli_ctx_put(ctx, 1);
-                RETURN(-EACCES);
-        }
+       if (cli_ctx_is_error(ctx)) {
+               sptlrpc_cli_ctx_put(ctx, 1);
+               RETURN(-EACCES);
+       }
 
        req = ptlrpc_request_cache_alloc(GFP_NOFS);
        if (!req)
@@ -950,9 +981,9 @@ int sptlrpc_import_check_ctx(struct obd_import *imp)
        req->rq_flvr = sec->ps_flvr;
        req->rq_cli_ctx = ctx;
 
-        rc = sptlrpc_req_refresh_ctx(req, 0);
+       rc = sptlrpc_req_refresh_ctx(req, 0);
        LASSERT(list_empty(&req->rq_ctx_chain));
-        sptlrpc_cli_ctx_put(req->rq_cli_ctx, 1);
+       sptlrpc_cli_ctx_put(req->rq_cli_ctx, 1);
        ptlrpc_request_cache_free(req);
 
        RETURN(rc);
@@ -965,106 +996,109 @@ int sptlrpc_import_check_ctx(struct obd_import *imp)
  */
 int sptlrpc_cli_wrap_request(struct ptlrpc_request *req)
 {
-        struct ptlrpc_cli_ctx *ctx = req->rq_cli_ctx;
-        int rc = 0;
-        ENTRY;
-
-        LASSERT(ctx);
-        LASSERT(ctx->cc_sec);
-        LASSERT(req->rq_reqbuf || req->rq_clrbuf);
-
-        /* we wrap bulk request here because now we can be sure
-         * the context is uptodate.
-         */
-        if (req->rq_bulk) {
-                rc = sptlrpc_cli_wrap_bulk(req, req->rq_bulk);
-                if (rc)
-                        RETURN(rc);
-        }
-
-        switch (SPTLRPC_FLVR_SVC(req->rq_flvr.sf_rpc)) {
-        case SPTLRPC_SVC_NULL:
-        case SPTLRPC_SVC_AUTH:
-        case SPTLRPC_SVC_INTG:
-                LASSERT(ctx->cc_ops->sign);
-                rc = ctx->cc_ops->sign(ctx, req);
-                break;
-        case SPTLRPC_SVC_PRIV:
-                LASSERT(ctx->cc_ops->seal);
-                rc = ctx->cc_ops->seal(ctx, req);
-                break;
-        default:
-                LBUG();
-        }
-
-        if (rc == 0) {
-                LASSERT(req->rq_reqdata_len);
-                LASSERT(req->rq_reqdata_len % 8 == 0);
-                LASSERT(req->rq_reqdata_len <= req->rq_reqbuf_len);
-        }
-
-        RETURN(rc);
+       struct ptlrpc_cli_ctx *ctx = req->rq_cli_ctx;
+       int rc = 0;
+
+       ENTRY;
+
+       LASSERT(ctx);
+       LASSERT(ctx->cc_sec);
+       LASSERT(req->rq_reqbuf || req->rq_clrbuf);
+
+       /*
+        * we wrap bulk request here because now we can be sure
+        * the context is uptodate.
+        */
+       if (req->rq_bulk) {
+               rc = sptlrpc_cli_wrap_bulk(req, req->rq_bulk);
+               if (rc)
+                       RETURN(rc);
+       }
+
+       switch (SPTLRPC_FLVR_SVC(req->rq_flvr.sf_rpc)) {
+       case SPTLRPC_SVC_NULL:
+       case SPTLRPC_SVC_AUTH:
+       case SPTLRPC_SVC_INTG:
+               LASSERT(ctx->cc_ops->sign);
+               rc = ctx->cc_ops->sign(ctx, req);
+               break;
+       case SPTLRPC_SVC_PRIV:
+               LASSERT(ctx->cc_ops->seal);
+               rc = ctx->cc_ops->seal(ctx, req);
+               break;
+       default:
+               LBUG();
+       }
+
+       if (rc == 0) {
+               LASSERT(req->rq_reqdata_len);
+               LASSERT(req->rq_reqdata_len % 8 == 0);
+               LASSERT(req->rq_reqdata_len <= req->rq_reqbuf_len);
+       }
+
+       RETURN(rc);
 }
 
 static int do_cli_unwrap_reply(struct ptlrpc_request *req)
 {
-        struct ptlrpc_cli_ctx *ctx = req->rq_cli_ctx;
-        int                    rc;
-        ENTRY;
-
-        LASSERT(ctx);
-        LASSERT(ctx->cc_sec);
-        LASSERT(req->rq_repbuf);
-        LASSERT(req->rq_repdata);
-        LASSERT(req->rq_repmsg == NULL);
-
-        req->rq_rep_swab_mask = 0;
-
-        rc = __lustre_unpack_msg(req->rq_repdata, req->rq_repdata_len);
-        switch (rc) {
-        case 1:
-                lustre_set_rep_swabbed(req, MSG_PTLRPC_HEADER_OFF);
-        case 0:
-                break;
-        default:
-                CERROR("failed unpack reply: x"LPU64"\n", req->rq_xid);
-                RETURN(-EPROTO);
-        }
-
-        if (req->rq_repdata_len < sizeof(struct lustre_msg)) {
-                CERROR("replied data length %d too small\n",
-                       req->rq_repdata_len);
-                RETURN(-EPROTO);
-        }
-
-        if (SPTLRPC_FLVR_POLICY(req->rq_repdata->lm_secflvr) !=
-            SPTLRPC_FLVR_POLICY(req->rq_flvr.sf_rpc)) {
-                CERROR("reply policy %u doesn't match request policy %u\n",
-                       SPTLRPC_FLVR_POLICY(req->rq_repdata->lm_secflvr),
-                       SPTLRPC_FLVR_POLICY(req->rq_flvr.sf_rpc));
-                RETURN(-EPROTO);
-        }
-
-        switch (SPTLRPC_FLVR_SVC(req->rq_flvr.sf_rpc)) {
-        case SPTLRPC_SVC_NULL:
-        case SPTLRPC_SVC_AUTH:
-        case SPTLRPC_SVC_INTG:
-                LASSERT(ctx->cc_ops->verify);
-                rc = ctx->cc_ops->verify(ctx, req);
-                break;
-        case SPTLRPC_SVC_PRIV:
-                LASSERT(ctx->cc_ops->unseal);
-                rc = ctx->cc_ops->unseal(ctx, req);
-                break;
-        default:
-                LBUG();
-        }
-        LASSERT(rc || req->rq_repmsg || req->rq_resend);
-
-        if (SPTLRPC_FLVR_POLICY(req->rq_flvr.sf_rpc) != SPTLRPC_POLICY_NULL &&
-            !req->rq_ctx_init)
-                req->rq_rep_swab_mask = 0;
-        RETURN(rc);
+       struct ptlrpc_cli_ctx *ctx = req->rq_cli_ctx;
+       int rc;
+
+       ENTRY;
+
+       LASSERT(ctx);
+       LASSERT(ctx->cc_sec);
+       LASSERT(req->rq_repbuf);
+       LASSERT(req->rq_repdata);
+       LASSERT(req->rq_repmsg == NULL);
+
+       req->rq_rep_swab_mask = 0;
+
+       rc = __lustre_unpack_msg(req->rq_repdata, req->rq_repdata_len);
+       switch (rc) {
+       case 1:
+               lustre_set_rep_swabbed(req, MSG_PTLRPC_HEADER_OFF);
+       case 0:
+               break;
+       default:
+               CERROR("failed unpack reply: x%llu\n", req->rq_xid);
+               RETURN(-EPROTO);
+       }
+
+       if (req->rq_repdata_len < sizeof(struct lustre_msg)) {
+               CERROR("replied data length %d too small\n",
+                      req->rq_repdata_len);
+               RETURN(-EPROTO);
+       }
+
+       if (SPTLRPC_FLVR_POLICY(req->rq_repdata->lm_secflvr) !=
+           SPTLRPC_FLVR_POLICY(req->rq_flvr.sf_rpc)) {
+               CERROR("reply policy %u doesn't match request policy %u\n",
+                      SPTLRPC_FLVR_POLICY(req->rq_repdata->lm_secflvr),
+                      SPTLRPC_FLVR_POLICY(req->rq_flvr.sf_rpc));
+               RETURN(-EPROTO);
+       }
+
+       switch (SPTLRPC_FLVR_SVC(req->rq_flvr.sf_rpc)) {
+       case SPTLRPC_SVC_NULL:
+       case SPTLRPC_SVC_AUTH:
+       case SPTLRPC_SVC_INTG:
+               LASSERT(ctx->cc_ops->verify);
+               rc = ctx->cc_ops->verify(ctx, req);
+               break;
+       case SPTLRPC_SVC_PRIV:
+               LASSERT(ctx->cc_ops->unseal);
+               rc = ctx->cc_ops->unseal(ctx, req);
+               break;
+       default:
+               LBUG();
+       }
+       LASSERT(rc || req->rq_repmsg || req->rq_resend);
+
+       if (SPTLRPC_FLVR_POLICY(req->rq_flvr.sf_rpc) != SPTLRPC_POLICY_NULL &&
+           !req->rq_ctx_init)
+               req->rq_rep_swab_mask = 0;
+       RETURN(rc);
 }
 
 /**
@@ -1077,34 +1111,34 @@ static int do_cli_unwrap_reply(struct ptlrpc_request *req)
  */
 int sptlrpc_cli_unwrap_reply(struct ptlrpc_request *req)
 {
-        LASSERT(req->rq_repbuf);
-        LASSERT(req->rq_repdata == NULL);
-        LASSERT(req->rq_repmsg == NULL);
-        LASSERT(req->rq_reply_off + req->rq_nob_received <= req->rq_repbuf_len);
+       LASSERT(req->rq_repbuf);
+       LASSERT(req->rq_repdata == NULL);
+       LASSERT(req->rq_repmsg == NULL);
+       LASSERT(req->rq_reply_off + req->rq_nob_received <= req->rq_repbuf_len);
 
-        if (req->rq_reply_off == 0 &&
-            (lustre_msghdr_get_flags(req->rq_reqmsg) & MSGHDR_AT_SUPPORT)) {
-                CERROR("real reply with offset 0\n");
-                return -EPROTO;
-        }
+       if (req->rq_reply_off == 0 &&
+           (lustre_msghdr_get_flags(req->rq_reqmsg) & MSGHDR_AT_SUPPORT)) {
+               CERROR("real reply with offset 0\n");
+               return -EPROTO;
+       }
 
-        if (req->rq_reply_off % 8 != 0) {
-                CERROR("reply at odd offset %u\n", req->rq_reply_off);
-                return -EPROTO;
-        }
+       if (req->rq_reply_off % 8 != 0) {
+               CERROR("reply at odd offset %u\n", req->rq_reply_off);
+               return -EPROTO;
+       }
 
-        req->rq_repdata = (struct lustre_msg *)
-                                (req->rq_repbuf + req->rq_reply_off);
-        req->rq_repdata_len = req->rq_nob_received;
+       req->rq_repdata = (struct lustre_msg *)
+                               (req->rq_repbuf + req->rq_reply_off);
+       req->rq_repdata_len = req->rq_nob_received;
 
-        return do_cli_unwrap_reply(req);
+       return do_cli_unwrap_reply(req);
 }
 
 /**
  * Used by ptlrpc client, to perform security transformation upon the early
  * reply message of \a req. We expect the rq_reply_off is 0, and
  * rq_nob_received is the early reply size.
- * 
+ *
  * Because the receive buffer might be still posted, the reply data might be
  * changed at any time, no matter we're holding rq_lock or not. For this reason
  * we allocate a separate ptlrpc_request and reply buffer for early reply
@@ -1118,10 +1152,11 @@ int sptlrpc_cli_unwrap_reply(struct ptlrpc_request *req)
 int sptlrpc_cli_unwrap_early_reply(struct ptlrpc_request *req,
                                   struct ptlrpc_request **req_ret)
 {
-       struct ptlrpc_request  *early_req;
-       char                   *early_buf;
-       int                     early_bufsz, early_size;
-       int                     rc;
+       struct ptlrpc_request *early_req;
+       char *early_buf;
+       int early_bufsz, early_size;
+       int rc;
+
        ENTRY;
 
        early_req = ptlrpc_request_cache_alloc(GFP_NOFS);
@@ -1172,30 +1207,30 @@ int sptlrpc_cli_unwrap_early_reply(struct ptlrpc_request *req,
        memcpy(early_buf, req->rq_repbuf, early_size);
        spin_unlock(&req->rq_lock);
 
-        early_req->rq_cli_ctx = sptlrpc_cli_ctx_get(req->rq_cli_ctx);
-        early_req->rq_flvr = req->rq_flvr;
-        early_req->rq_repbuf = early_buf;
-        early_req->rq_repbuf_len = early_bufsz;
-        early_req->rq_repdata = (struct lustre_msg *) early_buf;
-        early_req->rq_repdata_len = early_size;
-        early_req->rq_early = 1;
-        early_req->rq_reqmsg = req->rq_reqmsg;
-
-        rc = do_cli_unwrap_reply(early_req);
-        if (rc) {
-                DEBUG_REQ(D_ADAPTTO, early_req,
-                          "error %d unwrap early reply", rc);
-                GOTO(err_ctx, rc);
-        }
-
-        LASSERT(early_req->rq_repmsg);
-        *req_ret = early_req;
-        RETURN(0);
+       early_req->rq_cli_ctx = sptlrpc_cli_ctx_get(req->rq_cli_ctx);
+       early_req->rq_flvr = req->rq_flvr;
+       early_req->rq_repbuf = early_buf;
+       early_req->rq_repbuf_len = early_bufsz;
+       early_req->rq_repdata = (struct lustre_msg *) early_buf;
+       early_req->rq_repdata_len = early_size;
+       early_req->rq_early = 1;
+       early_req->rq_reqmsg = req->rq_reqmsg;
+
+       rc = do_cli_unwrap_reply(early_req);
+       if (rc) {
+               DEBUG_REQ(D_ADAPTTO, early_req,
+                         "unwrap early reply: rc = %d", rc);
+               GOTO(err_ctx, rc);
+       }
+
+       LASSERT(early_req->rq_repmsg);
+       *req_ret = early_req;
+       RETURN(0);
 
 err_ctx:
-        sptlrpc_cli_ctx_put(early_req->rq_cli_ctx, 1);
+       sptlrpc_cli_ctx_put(early_req->rq_cli_ctx, 1);
 err_buf:
-        OBD_FREE_LARGE(early_buf, early_bufsz);
+       OBD_FREE_LARGE(early_buf, early_bufsz);
 err_req:
        ptlrpc_request_cache_free(early_req);
        RETURN(rc);
@@ -1232,50 +1267,50 @@ int sptlrpc_get_next_secid(void)
 }
 EXPORT_SYMBOL(sptlrpc_get_next_secid);
 
-/**************************************************
- * client side high-level security APIs           *
- **************************************************/
+/*
+ * client side high-level security APIs
+ */
 
 static int sec_cop_flush_ctx_cache(struct ptlrpc_sec *sec, uid_t uid,
-                                   int grace, int force)
+                                  int grace, int force)
 {
-        struct ptlrpc_sec_policy *policy = sec->ps_policy;
+       struct ptlrpc_sec_policy *policy = sec->ps_policy;
 
-        LASSERT(policy->sp_cops);
-        LASSERT(policy->sp_cops->flush_ctx_cache);
+       LASSERT(policy->sp_cops);
+       LASSERT(policy->sp_cops->flush_ctx_cache);
 
-        return policy->sp_cops->flush_ctx_cache(sec, uid, grace, force);
+       return policy->sp_cops->flush_ctx_cache(sec, uid, grace, force);
 }
 
 static void sec_cop_destroy_sec(struct ptlrpc_sec *sec)
 {
-        struct ptlrpc_sec_policy *policy = sec->ps_policy;
+       struct ptlrpc_sec_policy *policy = sec->ps_policy;
 
-        LASSERT_ATOMIC_ZERO(&sec->ps_refcount);
-        LASSERT_ATOMIC_ZERO(&sec->ps_nctx);
-        LASSERT(policy->sp_cops->destroy_sec);
+       LASSERT_ATOMIC_ZERO(&sec->ps_refcount);
+       LASSERT_ATOMIC_ZERO(&sec->ps_nctx);
+       LASSERT(policy->sp_cops->destroy_sec);
 
-        CDEBUG(D_SEC, "%s@%p: being destroied\n", sec->ps_policy->sp_name, sec);
+       CDEBUG(D_SEC, "%s@%p: being destroied\n", sec->ps_policy->sp_name, sec);
 
-        policy->sp_cops->destroy_sec(sec);
-        sptlrpc_policy_put(policy);
+       policy->sp_cops->destroy_sec(sec);
+       sptlrpc_policy_put(policy);
 }
 
 void sptlrpc_sec_destroy(struct ptlrpc_sec *sec)
 {
-        sec_cop_destroy_sec(sec);
+       sec_cop_destroy_sec(sec);
 }
 EXPORT_SYMBOL(sptlrpc_sec_destroy);
 
 static void sptlrpc_sec_kill(struct ptlrpc_sec *sec)
 {
-        LASSERT_ATOMIC_POS(&sec->ps_refcount);
+       LASSERT_ATOMIC_POS(&sec->ps_refcount);
 
-        if (sec->ps_policy->sp_cops->kill_sec) {
-                sec->ps_policy->sp_cops->kill_sec(sec);
+       if (sec->ps_policy->sp_cops->kill_sec) {
+               sec->ps_policy->sp_cops->kill_sec(sec);
 
-                sec_cop_flush_ctx_cache(sec, -1, 1, 1);
-        }
+               sec_cop_flush_ctx_cache(sec, -1, 1, 1);
+       }
 }
 
 struct ptlrpc_sec *sptlrpc_sec_get(struct ptlrpc_sec *sec)
@@ -1305,39 +1340,40 @@ EXPORT_SYMBOL(sptlrpc_sec_put);
  */
 static
 struct ptlrpc_sec * sptlrpc_sec_create(struct obd_import *imp,
-                                       struct ptlrpc_svc_ctx *svc_ctx,
-                                       struct sptlrpc_flavor *sf,
-                                       enum lustre_sec_part sp)
-{
-        struct ptlrpc_sec_policy *policy;
-        struct ptlrpc_sec        *sec;
-        char                      str[32];
-        ENTRY;
-
-        if (svc_ctx) {
-                LASSERT(imp->imp_dlm_fake == 1);
-
-                CDEBUG(D_SEC, "%s %s: reverse sec using flavor %s\n",
-                       imp->imp_obd->obd_type->typ_name,
-                       imp->imp_obd->obd_name,
-                       sptlrpc_flavor2name(sf, str, sizeof(str)));
-
-                policy = sptlrpc_policy_get(svc_ctx->sc_policy);
-                sf->sf_flags |= PTLRPC_SEC_FL_REVERSE | PTLRPC_SEC_FL_ROOTONLY;
-        } else {
-                LASSERT(imp->imp_dlm_fake == 0);
-
-                CDEBUG(D_SEC, "%s %s: select security flavor %s\n",
-                       imp->imp_obd->obd_type->typ_name,
-                       imp->imp_obd->obd_name,
-                       sptlrpc_flavor2name(sf, str, sizeof(str)));
-
-                policy = sptlrpc_wireflavor2policy(sf->sf_rpc);
-                if (!policy) {
-                        CERROR("invalid flavor 0x%x\n", sf->sf_rpc);
-                        RETURN(NULL);
-                }
-        }
+                                      struct ptlrpc_svc_ctx *svc_ctx,
+                                      struct sptlrpc_flavor *sf,
+                                      enum lustre_sec_part sp)
+{
+       struct ptlrpc_sec_policy *policy;
+       struct ptlrpc_sec *sec;
+       char str[32];
+
+       ENTRY;
+
+       if (svc_ctx) {
+               LASSERT(imp->imp_dlm_fake == 1);
+
+               CDEBUG(D_SEC, "%s %s: reverse sec using flavor %s\n",
+                      imp->imp_obd->obd_type->typ_name,
+                      imp->imp_obd->obd_name,
+                      sptlrpc_flavor2name(sf, str, sizeof(str)));
+
+               policy = sptlrpc_policy_get(svc_ctx->sc_policy);
+               sf->sf_flags |= PTLRPC_SEC_FL_REVERSE | PTLRPC_SEC_FL_ROOTONLY;
+       } else {
+               LASSERT(imp->imp_dlm_fake == 0);
+
+               CDEBUG(D_SEC, "%s %s: select security flavor %s\n",
+                      imp->imp_obd->obd_type->typ_name,
+                      imp->imp_obd->obd_name,
+                      sptlrpc_flavor2name(sf, str, sizeof(str)));
+
+               policy = sptlrpc_wireflavor2policy(sf->sf_rpc);
+               if (!policy) {
+                       CERROR("invalid flavor 0x%x\n", sf->sf_rpc);
+                       RETURN(NULL);
+               }
+       }
 
        sec = policy->sp_cops->create_sec(imp, svc_ctx, sf);
        if (sec) {
@@ -1358,62 +1394,44 @@ struct ptlrpc_sec *sptlrpc_import_sec_ref(struct obd_import *imp)
 {
        struct ptlrpc_sec *sec;
 
-       spin_lock(&imp->imp_lock);
+       read_lock(&imp->imp_sec_lock);
        sec = sptlrpc_sec_get(imp->imp_sec);
-       spin_unlock(&imp->imp_lock);
+       read_unlock(&imp->imp_sec_lock);
 
        return sec;
 }
 EXPORT_SYMBOL(sptlrpc_import_sec_ref);
 
 static void sptlrpc_import_sec_install(struct obd_import *imp,
-                                       struct ptlrpc_sec *sec)
+                                      struct ptlrpc_sec *sec)
 {
        struct ptlrpc_sec *old_sec;
 
        LASSERT_ATOMIC_POS(&sec->ps_refcount);
 
-       spin_lock(&imp->imp_lock);
+       write_lock(&imp->imp_sec_lock);
        old_sec = imp->imp_sec;
        imp->imp_sec = sec;
-       spin_unlock(&imp->imp_lock);
+       write_unlock(&imp->imp_sec_lock);
 
-        if (old_sec) {
-                sptlrpc_sec_kill(old_sec);
+       if (old_sec) {
+               sptlrpc_sec_kill(old_sec);
 
-                /* balance the ref taken by this import */
-                sptlrpc_sec_put(old_sec);
-        }
+               /* balance the ref taken by this import */
+               sptlrpc_sec_put(old_sec);
+       }
 }
 
 static inline
 int flavor_equal(struct sptlrpc_flavor *sf1, struct sptlrpc_flavor *sf2)
 {
-        return (memcmp(sf1, sf2, sizeof(*sf1)) == 0);
+       return (memcmp(sf1, sf2, sizeof(*sf1)) == 0);
 }
 
 static inline
 void flavor_copy(struct sptlrpc_flavor *dst, struct sptlrpc_flavor *src)
 {
-        *dst = *src;
-}
-
-static void sptlrpc_import_sec_adapt_inplace(struct obd_import *imp,
-                                             struct ptlrpc_sec *sec,
-                                             struct sptlrpc_flavor *sf)
-{
-        char    str1[32], str2[32];
-
-        if (sec->ps_flvr.sf_flags != sf->sf_flags)
-                CDEBUG(D_SEC, "changing sec flags: %s -> %s\n",
-                       sptlrpc_secflags2str(sec->ps_flvr.sf_flags,
-                                            str1, sizeof(str1)),
-                       sptlrpc_secflags2str(sf->sf_flags,
-                                            str2, sizeof(str2)));
-
-       spin_lock(&sec->ps_lock);
-       flavor_copy(&sec->ps_flvr, sf);
-       spin_unlock(&sec->ps_lock);
+       *dst = *src;
 }
 
 /**
@@ -1424,15 +1442,16 @@ static void sptlrpc_import_sec_adapt_inplace(struct obd_import *imp,
  *  - reverse import: \a svc_ctx and \a flvr are obtained from incoming request.
  */
 int sptlrpc_import_sec_adapt(struct obd_import *imp,
-                             struct ptlrpc_svc_ctx *svc_ctx,
-                             struct sptlrpc_flavor *flvr)
-{
-       struct ptlrpc_connection   *conn;
-       struct sptlrpc_flavor       sf;
-       struct ptlrpc_sec          *sec, *newsec;
-       enum lustre_sec_part        sp;
-       char                        str[24];
-       int                         rc = 0;
+                            struct ptlrpc_svc_ctx *svc_ctx,
+                            struct sptlrpc_flavor *flvr)
+{
+       struct ptlrpc_connection *conn;
+       struct sptlrpc_flavor sf;
+       struct ptlrpc_sec *sec, *newsec;
+       enum lustre_sec_part sp;
+       char str[24];
+       int rc = 0;
+
        ENTRY;
 
        might_sleep();
@@ -1442,110 +1461,101 @@ int sptlrpc_import_sec_adapt(struct obd_import *imp,
 
        conn = imp->imp_connection;
 
-        if (svc_ctx == NULL) {
-                struct client_obd *cliobd = &imp->imp_obd->u.cli;
-                /*
-                 * normal import, determine flavor from rule set, except
-                 * for mgc the flavor is predetermined.
-                 */
-                if (cliobd->cl_sp_me == LUSTRE_SP_MGC)
-                        sf = cliobd->cl_flvr_mgc;
-                else 
-                        sptlrpc_conf_choose_flavor(cliobd->cl_sp_me,
-                                                   cliobd->cl_sp_to,
-                                                   &cliobd->cl_target_uuid,
-                                                   conn->c_self, &sf);
-
-                sp = imp->imp_obd->u.cli.cl_sp_me;
-        } else {
-                /* reverse import, determine flavor from incoming reqeust */
-                sf = *flvr;
-
-                if (sf.sf_rpc != SPTLRPC_FLVR_NULL)
-                        sf.sf_flags = PTLRPC_SEC_FL_REVERSE |
-                                      PTLRPC_SEC_FL_ROOTONLY;
-
-                sp = sptlrpc_target_sec_part(imp->imp_obd);
-        }
-
-        sec = sptlrpc_import_sec_ref(imp);
-        if (sec) {
-                char    str2[24];
-
-                if (flavor_equal(&sf, &sec->ps_flvr))
-                        GOTO(out, rc);
-
-                CDEBUG(D_SEC, "import %s->%s: changing flavor %s -> %s\n",
-                       imp->imp_obd->obd_name,
-                       obd_uuid2str(&conn->c_remote_uuid),
-                       sptlrpc_flavor2name(&sec->ps_flvr, str, sizeof(str)),
-                       sptlrpc_flavor2name(&sf, str2, sizeof(str2)));
-
-                if (SPTLRPC_FLVR_POLICY(sf.sf_rpc) ==
-                    SPTLRPC_FLVR_POLICY(sec->ps_flvr.sf_rpc) &&
-                    SPTLRPC_FLVR_MECH(sf.sf_rpc) ==
-                    SPTLRPC_FLVR_MECH(sec->ps_flvr.sf_rpc)) {
-                        sptlrpc_import_sec_adapt_inplace(imp, sec, &sf);
-                        GOTO(out, rc);
-                }
-        } else if (SPTLRPC_FLVR_BASE(sf.sf_rpc) !=
-                   SPTLRPC_FLVR_BASE(SPTLRPC_FLVR_NULL)) {
-                CDEBUG(D_SEC, "import %s->%s netid %x: select flavor %s\n",
-                       imp->imp_obd->obd_name,
-                       obd_uuid2str(&conn->c_remote_uuid),
-                       LNET_NIDNET(conn->c_self),
-                       sptlrpc_flavor2name(&sf, str, sizeof(str)));
-        }
-
-       mutex_lock(&imp->imp_sec_mutex);
-
-        newsec = sptlrpc_sec_create(imp, svc_ctx, &sf, sp);
-        if (newsec) {
-                sptlrpc_import_sec_install(imp, newsec);
-        } else {
-                CERROR("import %s->%s: failed to create new sec\n",
-                       imp->imp_obd->obd_name,
-                       obd_uuid2str(&conn->c_remote_uuid));
-                rc = -EPERM;
-        }
-
-       mutex_unlock(&imp->imp_sec_mutex);
+       if (svc_ctx == NULL) {
+               struct client_obd *cliobd = &imp->imp_obd->u.cli;
+               /*
+                * normal import, determine flavor from rule set, except
+                * for mgc the flavor is predetermined.
+                */
+               if (cliobd->cl_sp_me == LUSTRE_SP_MGC)
+                       sf = cliobd->cl_flvr_mgc;
+               else
+                       sptlrpc_conf_choose_flavor(cliobd->cl_sp_me,
+                                                  cliobd->cl_sp_to,
+                                                  &cliobd->cl_target_uuid,
+                                                  conn->c_self, &sf);
+
+               sp = imp->imp_obd->u.cli.cl_sp_me;
+       } else {
+               /* reverse import, determine flavor from incoming reqeust */
+               sf = *flvr;
+
+               if (sf.sf_rpc != SPTLRPC_FLVR_NULL)
+                       sf.sf_flags = PTLRPC_SEC_FL_REVERSE |
+                                     PTLRPC_SEC_FL_ROOTONLY;
+
+               sp = sptlrpc_target_sec_part(imp->imp_obd);
+       }
+
+       sec = sptlrpc_import_sec_ref(imp);
+       if (sec) {
+               char str2[24];
+
+               if (flavor_equal(&sf, &sec->ps_flvr))
+                       GOTO(out, rc);
+
+               CDEBUG(D_SEC, "import %s->%s: changing flavor %s -> %s\n",
+                      imp->imp_obd->obd_name,
+                      obd_uuid2str(&conn->c_remote_uuid),
+                      sptlrpc_flavor2name(&sec->ps_flvr, str, sizeof(str)),
+                      sptlrpc_flavor2name(&sf, str2, sizeof(str2)));
+       } else if (SPTLRPC_FLVR_BASE(sf.sf_rpc) !=
+                  SPTLRPC_FLVR_BASE(SPTLRPC_FLVR_NULL)) {
+               CDEBUG(D_SEC, "import %s->%s netid %x: select flavor %s\n",
+                      imp->imp_obd->obd_name,
+                      obd_uuid2str(&conn->c_remote_uuid),
+                      LNET_NIDNET(conn->c_self),
+                      sptlrpc_flavor2name(&sf, str, sizeof(str)));
+       }
+
+       newsec = sptlrpc_sec_create(imp, svc_ctx, &sf, sp);
+       if (newsec) {
+               sptlrpc_import_sec_install(imp, newsec);
+       } else {
+               CERROR("import %s->%s: failed to create new sec\n",
+                      imp->imp_obd->obd_name,
+                      obd_uuid2str(&conn->c_remote_uuid));
+               rc = -EPERM;
+       }
+
 out:
-        sptlrpc_sec_put(sec);
-        RETURN(rc);
+       sptlrpc_sec_put(sec);
+       RETURN(rc);
 }
 
 void sptlrpc_import_sec_put(struct obd_import *imp)
 {
-        if (imp->imp_sec) {
-                sptlrpc_sec_kill(imp->imp_sec);
+       if (imp->imp_sec) {
+               sptlrpc_sec_kill(imp->imp_sec);
 
-                sptlrpc_sec_put(imp->imp_sec);
-                imp->imp_sec = NULL;
-        }
+               sptlrpc_sec_put(imp->imp_sec);
+               imp->imp_sec = NULL;
+       }
 }
 
 static void import_flush_ctx_common(struct obd_import *imp,
-                                    uid_t uid, int grace, int force)
+                                   uid_t uid, int grace, int force)
 {
-        struct ptlrpc_sec *sec;
+       struct ptlrpc_sec *sec;
 
-        if (imp == NULL)
-                return;
+       if (imp == NULL)
+               return;
 
-        sec = sptlrpc_import_sec_ref(imp);
-        if (sec == NULL)
-                return;
+       sec = sptlrpc_import_sec_ref(imp);
+       if (sec == NULL)
+               return;
 
-        sec_cop_flush_ctx_cache(sec, uid, grace, force);
-        sptlrpc_sec_put(sec);
+       sec_cop_flush_ctx_cache(sec, uid, grace, force);
+       sptlrpc_sec_put(sec);
 }
 
 void sptlrpc_import_flush_root_ctx(struct obd_import *imp)
 {
-        /* it's important to use grace mode, see explain in
-         * sptlrpc_req_refresh_ctx() */
-        import_flush_ctx_common(imp, 0, 1, 1);
+       /*
+        * it's important to use grace mode, see explain in
+        * sptlrpc_req_refresh_ctx()
+        */
+       import_flush_ctx_common(imp, 0, 1, 1);
 }
 
 void sptlrpc_import_flush_my_ctx(struct obd_import *imp)
@@ -1557,7 +1567,7 @@ EXPORT_SYMBOL(sptlrpc_import_flush_my_ctx);
 
 void sptlrpc_import_flush_all_ctx(struct obd_import *imp)
 {
-        import_flush_ctx_common(imp, -1, 1, 1);
+       import_flush_ctx_common(imp, -1, 1, 1);
 }
 EXPORT_SYMBOL(sptlrpc_import_flush_all_ctx);
 
@@ -1567,28 +1577,28 @@ EXPORT_SYMBOL(sptlrpc_import_flush_all_ctx);
  */
 int sptlrpc_cli_alloc_reqbuf(struct ptlrpc_request *req, int msgsize)
 {
-        struct ptlrpc_cli_ctx *ctx = req->rq_cli_ctx;
-        struct ptlrpc_sec_policy *policy;
-        int rc;
+       struct ptlrpc_cli_ctx *ctx = req->rq_cli_ctx;
+       struct ptlrpc_sec_policy *policy;
+       int rc;
 
-        LASSERT(ctx);
-        LASSERT(ctx->cc_sec);
-        LASSERT(ctx->cc_sec->ps_policy);
-        LASSERT(req->rq_reqmsg == NULL);
-        LASSERT_ATOMIC_POS(&ctx->cc_refcount);
+       LASSERT(ctx);
+       LASSERT(ctx->cc_sec);
+       LASSERT(ctx->cc_sec->ps_policy);
+       LASSERT(req->rq_reqmsg == NULL);
+       LASSERT_ATOMIC_POS(&ctx->cc_refcount);
 
-        policy = ctx->cc_sec->ps_policy;
-        rc = policy->sp_cops->alloc_reqbuf(ctx->cc_sec, req, msgsize);
-        if (!rc) {
-                LASSERT(req->rq_reqmsg);
-                LASSERT(req->rq_reqbuf || req->rq_clrbuf);
+       policy = ctx->cc_sec->ps_policy;
+       rc = policy->sp_cops->alloc_reqbuf(ctx->cc_sec, req, msgsize);
+       if (!rc) {
+               LASSERT(req->rq_reqmsg);
+               LASSERT(req->rq_reqbuf || req->rq_clrbuf);
 
-                /* zeroing preallocated buffer */
-                if (req->rq_pool)
-                        memset(req->rq_reqmsg, 0, msgsize);
-        }
+               /* zeroing preallocated buffer */
+               if (req->rq_pool)
+                       memset(req->rq_reqmsg, 0, msgsize);
+       }
 
-        return rc;
+       return rc;
 }
 
 /**
@@ -1597,63 +1607,63 @@ int sptlrpc_cli_alloc_reqbuf(struct ptlrpc_request *req, int msgsize)
  */
 void sptlrpc_cli_free_reqbuf(struct ptlrpc_request *req)
 {
-        struct ptlrpc_cli_ctx *ctx = req->rq_cli_ctx;
-        struct ptlrpc_sec_policy *policy;
+       struct ptlrpc_cli_ctx *ctx = req->rq_cli_ctx;
+       struct ptlrpc_sec_policy *policy;
 
-        LASSERT(ctx);
-        LASSERT(ctx->cc_sec);
-        LASSERT(ctx->cc_sec->ps_policy);
-        LASSERT_ATOMIC_POS(&ctx->cc_refcount);
+       LASSERT(ctx);
+       LASSERT(ctx->cc_sec);
+       LASSERT(ctx->cc_sec->ps_policy);
+       LASSERT_ATOMIC_POS(&ctx->cc_refcount);
 
-        if (req->rq_reqbuf == NULL && req->rq_clrbuf == NULL)
-                return;
+       if (req->rq_reqbuf == NULL && req->rq_clrbuf == NULL)
+               return;
 
-        policy = ctx->cc_sec->ps_policy;
-        policy->sp_cops->free_reqbuf(ctx->cc_sec, req);
-        req->rq_reqmsg = NULL;
+       policy = ctx->cc_sec->ps_policy;
+       policy->sp_cops->free_reqbuf(ctx->cc_sec, req);
+       req->rq_reqmsg = NULL;
 }
 
 /*
  * NOTE caller must guarantee the buffer size is enough for the enlargement
  */
 void _sptlrpc_enlarge_msg_inplace(struct lustre_msg *msg,
-                                  int segment, int newsize)
+                                 int segment, int newsize)
 {
-        void   *src, *dst;
-        int     oldsize, oldmsg_size, movesize;
+       void *src, *dst;
+       int oldsize, oldmsg_size, movesize;
 
-        LASSERT(segment < msg->lm_bufcount);
-        LASSERT(msg->lm_buflens[segment] <= newsize);
+       LASSERT(segment < msg->lm_bufcount);
+       LASSERT(msg->lm_buflens[segment] <= newsize);
 
-        if (msg->lm_buflens[segment] == newsize)
-                return;
+       if (msg->lm_buflens[segment] == newsize)
+               return;
 
-        /* nothing to do if we are enlarging the last segment */
-        if (segment == msg->lm_bufcount - 1) {
-                msg->lm_buflens[segment] = newsize;
-                return;
-        }
+       /* nothing to do if we are enlarging the last segment */
+       if (segment == msg->lm_bufcount - 1) {
+               msg->lm_buflens[segment] = newsize;
+               return;
+       }
 
-        oldsize = msg->lm_buflens[segment];
+       oldsize = msg->lm_buflens[segment];
 
-        src = lustre_msg_buf(msg, segment + 1, 0);
-        msg->lm_buflens[segment] = newsize;
-        dst = lustre_msg_buf(msg, segment + 1, 0);
-        msg->lm_buflens[segment] = oldsize;
+       src = lustre_msg_buf(msg, segment + 1, 0);
+       msg->lm_buflens[segment] = newsize;
+       dst = lustre_msg_buf(msg, segment + 1, 0);
+       msg->lm_buflens[segment] = oldsize;
 
-        /* move from segment + 1 to end segment */
-        LASSERT(msg->lm_magic == LUSTRE_MSG_MAGIC_V2);
-        oldmsg_size = lustre_msg_size_v2(msg->lm_bufcount, msg->lm_buflens);
-        movesize = oldmsg_size - ((unsigned long) src - (unsigned long) msg);
-        LASSERT(movesize >= 0);
+       /* move from segment + 1 to end segment */
+       LASSERT(msg->lm_magic == LUSTRE_MSG_MAGIC_V2);
+       oldmsg_size = lustre_msg_size_v2(msg->lm_bufcount, msg->lm_buflens);
+       movesize = oldmsg_size - ((unsigned long) src - (unsigned long) msg);
+       LASSERT(movesize >= 0);
 
-        if (movesize)
-                memmove(dst, src, movesize);
+       if (movesize)
+               memmove(dst, src, movesize);
 
-        /* note we don't clear the ares where old data live, not secret */
+       /* note we don't clear the ares where old data live, not secret */
 
-        /* finally set new segment size */
-        msg->lm_buflens[segment] = newsize;
+       /* finally set new segment size */
+       msg->lm_buflens[segment] = newsize;
 }
 EXPORT_SYMBOL(_sptlrpc_enlarge_msg_inplace);
 
@@ -1667,23 +1677,26 @@ EXPORT_SYMBOL(_sptlrpc_enlarge_msg_inplace);
  * so caller should refresh its local pointers if needed.
  */
 int sptlrpc_cli_enlarge_reqbuf(struct ptlrpc_request *req,
-                               int segment, int newsize)
+                              const struct req_msg_field *field,
+                              int newsize)
 {
-        struct ptlrpc_cli_ctx    *ctx = req->rq_cli_ctx;
-        struct ptlrpc_sec_cops   *cops;
-        struct lustre_msg        *msg = req->rq_reqmsg;
+       struct req_capsule *pill = &req->rq_pill;
+       struct ptlrpc_cli_ctx *ctx = req->rq_cli_ctx;
+       struct ptlrpc_sec_cops *cops;
+       struct lustre_msg *msg = req->rq_reqmsg;
+       int segment = __req_capsule_offset(pill, field, RCL_CLIENT);
 
-        LASSERT(ctx);
-        LASSERT(msg);
-        LASSERT(msg->lm_bufcount > segment);
-        LASSERT(msg->lm_buflens[segment] <= newsize);
+       LASSERT(ctx);
+       LASSERT(msg);
+       LASSERT(msg->lm_bufcount > segment);
+       LASSERT(msg->lm_buflens[segment] <= newsize);
 
-        if (msg->lm_buflens[segment] == newsize)
-                return 0;
+       if (msg->lm_buflens[segment] == newsize)
+               return 0;
 
-        cops = ctx->cc_sec->ps_policy->sp_cops;
-        LASSERT(cops->enlarge_reqbuf);
-        return cops->enlarge_reqbuf(ctx->cc_sec, req, segment, newsize);
+       cops = ctx->cc_sec->ps_policy->sp_cops;
+       LASSERT(cops->enlarge_reqbuf);
+       return cops->enlarge_reqbuf(ctx->cc_sec, req, segment, newsize);
 }
 EXPORT_SYMBOL(sptlrpc_cli_enlarge_reqbuf);
 
@@ -1694,19 +1707,20 @@ EXPORT_SYMBOL(sptlrpc_cli_enlarge_reqbuf);
  */
 int sptlrpc_cli_alloc_repbuf(struct ptlrpc_request *req, int msgsize)
 {
-        struct ptlrpc_cli_ctx *ctx = req->rq_cli_ctx;
-        struct ptlrpc_sec_policy *policy;
-        ENTRY;
+       struct ptlrpc_cli_ctx *ctx = req->rq_cli_ctx;
+       struct ptlrpc_sec_policy *policy;
 
-        LASSERT(ctx);
-        LASSERT(ctx->cc_sec);
-        LASSERT(ctx->cc_sec->ps_policy);
+       ENTRY;
+
+       LASSERT(ctx);
+       LASSERT(ctx->cc_sec);
+       LASSERT(ctx->cc_sec->ps_policy);
 
-        if (req->rq_repbuf)
-                RETURN(0);
+       if (req->rq_repbuf)
+               RETURN(0);
 
-        policy = ctx->cc_sec->ps_policy;
-        RETURN(policy->sp_cops->alloc_repbuf(ctx->cc_sec, req, msgsize));
+       policy = ctx->cc_sec->ps_policy;
+       RETURN(policy->sp_cops->alloc_repbuf(ctx->cc_sec, req, msgsize));
 }
 
 /**
@@ -1715,64 +1729,185 @@ int sptlrpc_cli_alloc_repbuf(struct ptlrpc_request *req, int msgsize)
  */
 void sptlrpc_cli_free_repbuf(struct ptlrpc_request *req)
 {
-        struct ptlrpc_cli_ctx *ctx = req->rq_cli_ctx;
-        struct ptlrpc_sec_policy *policy;
-        ENTRY;
+       struct ptlrpc_cli_ctx *ctx = req->rq_cli_ctx;
+       struct ptlrpc_sec_policy *policy;
 
-        LASSERT(ctx);
-        LASSERT(ctx->cc_sec);
-        LASSERT(ctx->cc_sec->ps_policy);
-        LASSERT_ATOMIC_POS(&ctx->cc_refcount);
+       ENTRY;
 
-        if (req->rq_repbuf == NULL)
-                return;
-        LASSERT(req->rq_repbuf_len);
+       LASSERT(ctx);
+       LASSERT(ctx->cc_sec);
+       LASSERT(ctx->cc_sec->ps_policy);
+       LASSERT_ATOMIC_POS(&ctx->cc_refcount);
 
-        policy = ctx->cc_sec->ps_policy;
-        policy->sp_cops->free_repbuf(ctx->cc_sec, req);
-        req->rq_repmsg = NULL;
-        EXIT;
+       if (req->rq_repbuf == NULL)
+               return;
+       LASSERT(req->rq_repbuf_len);
+
+       policy = ctx->cc_sec->ps_policy;
+       policy->sp_cops->free_repbuf(ctx->cc_sec, req);
+       req->rq_repmsg = NULL;
+       EXIT;
 }
+EXPORT_SYMBOL(sptlrpc_cli_free_repbuf);
 
 int sptlrpc_cli_install_rvs_ctx(struct obd_import *imp,
-                                struct ptlrpc_cli_ctx *ctx)
+                               struct ptlrpc_cli_ctx *ctx)
 {
-        struct ptlrpc_sec_policy *policy = ctx->cc_sec->ps_policy;
+       struct ptlrpc_sec_policy *policy = ctx->cc_sec->ps_policy;
 
-        if (!policy->sp_cops->install_rctx)
-                return 0;
-        return policy->sp_cops->install_rctx(imp, ctx->cc_sec, ctx);
+       if (!policy->sp_cops->install_rctx)
+               return 0;
+       return policy->sp_cops->install_rctx(imp, ctx->cc_sec, ctx);
 }
 
 int sptlrpc_svc_install_rvs_ctx(struct obd_import *imp,
-                                struct ptlrpc_svc_ctx *ctx)
+                               struct ptlrpc_svc_ctx *ctx)
+{
+       struct ptlrpc_sec_policy *policy = ctx->sc_policy;
+
+       if (!policy->sp_sops->install_rctx)
+               return 0;
+       return policy->sp_sops->install_rctx(imp, ctx);
+}
+
+/* Get SELinux policy info from userspace */
+static int sepol_helper(struct obd_import *imp)
+{
+       char mtime_str[21] = { 0 }, mode_str[2] = { 0 };
+       char *argv[] = {
+               [0] = "/usr/sbin/l_getsepol",
+               [1] = "-o",
+               [2] = NULL,         /* obd type */
+               [3] = "-n",
+               [4] = NULL,         /* obd name */
+               [5] = "-t",
+               [6] = mtime_str,    /* policy mtime */
+               [7] = "-m",
+               [8] = mode_str,     /* enforcing mode */
+               [9] = NULL
+       };
+       char *envp[] = {
+               [0] = "HOME=/",
+               [1] = "PATH=/sbin:/usr/sbin",
+               [2] = NULL
+       };
+       signed short ret;
+       int rc = 0;
+
+       if (imp == NULL || imp->imp_obd == NULL ||
+           imp->imp_obd->obd_type == NULL) {
+               rc = -EINVAL;
+       } else {
+               argv[2] = (char *)imp->imp_obd->obd_type->typ_name;
+               argv[4] = imp->imp_obd->obd_name;
+               spin_lock(&imp->imp_sec->ps_lock);
+               if (imp->imp_sec->ps_sepol_mtime == 0 &&
+                   imp->imp_sec->ps_sepol[0] == '\0') {
+                       /* ps_sepol has not been initialized */
+                       argv[5] = NULL;
+                       argv[7] = NULL;
+               } else {
+                       snprintf(mtime_str, sizeof(mtime_str), "%lu",
+                                imp->imp_sec->ps_sepol_mtime);
+                       mode_str[0] = imp->imp_sec->ps_sepol[0];
+               }
+               spin_unlock(&imp->imp_sec->ps_lock);
+               ret = call_usermodehelper(argv[0], argv, envp, UMH_WAIT_PROC);
+               rc = ret>>8;
+       }
+
+       return rc;
+}
+
+static inline int sptlrpc_sepol_needs_check(struct ptlrpc_sec *imp_sec)
 {
-        struct ptlrpc_sec_policy *policy = ctx->sc_policy;
+       ktime_t checknext;
+
+       if (send_sepol == 0 || !selinux_is_enabled())
+               return 0;
+
+       if (send_sepol == -1)
+               /* send_sepol == -1 means fetch sepol status every time */
+               return 1;
+
+       spin_lock(&imp_sec->ps_lock);
+       checknext = imp_sec->ps_sepol_checknext;
+       spin_unlock(&imp_sec->ps_lock);
+
+       /* next check is too far in time, please update */
+       if (ktime_after(checknext,
+                       ktime_add(ktime_get(), ktime_set(send_sepol, 0))))
+               goto setnext;
+
+       if (ktime_before(ktime_get(), checknext))
+               /* too early to fetch sepol status */
+               return 0;
+
+setnext:
+       /* define new sepol_checknext time */
+       spin_lock(&imp_sec->ps_lock);
+       imp_sec->ps_sepol_checknext = ktime_add(ktime_get(),
+                                               ktime_set(send_sepol, 0));
+       spin_unlock(&imp_sec->ps_lock);
 
-        if (!policy->sp_sops->install_rctx)
-                return 0;
-        return policy->sp_sops->install_rctx(imp, ctx);
+       return 1;
 }
 
-/****************************************
- * server side security                 *
- ****************************************/
+int sptlrpc_get_sepol(struct ptlrpc_request *req)
+{
+       struct ptlrpc_sec *imp_sec = req->rq_import->imp_sec;
+       int rc = 0;
+
+       ENTRY;
+
+       (req->rq_sepol)[0] = '\0';
+
+#ifndef HAVE_SELINUX
+       if (unlikely(send_sepol != 0))
+               CDEBUG(D_SEC,
+                      "Client cannot report SELinux status, it was not built against libselinux.\n");
+       RETURN(0);
+#endif
+
+       if (send_sepol == 0 || !selinux_is_enabled())
+               RETURN(0);
+
+       if (imp_sec == NULL)
+               RETURN(-EINVAL);
+
+       /* Retrieve SELinux status info */
+       if (sptlrpc_sepol_needs_check(imp_sec))
+               rc = sepol_helper(req->rq_import);
+       if (likely(rc == 0)) {
+               spin_lock(&imp_sec->ps_lock);
+               memcpy(req->rq_sepol, imp_sec->ps_sepol,
+                      sizeof(req->rq_sepol));
+               spin_unlock(&imp_sec->ps_lock);
+       }
+
+       RETURN(rc);
+}
+EXPORT_SYMBOL(sptlrpc_get_sepol);
+
+/*
+ * server side security
+ */
 
 static int flavor_allowed(struct sptlrpc_flavor *exp,
-                          struct ptlrpc_request *req)
+                         struct ptlrpc_request *req)
 {
-        struct sptlrpc_flavor *flvr = &req->rq_flvr;
+       struct sptlrpc_flavor *flvr = &req->rq_flvr;
 
-        if (exp->sf_rpc == SPTLRPC_FLVR_ANY || exp->sf_rpc == flvr->sf_rpc)
-                return 1;
+       if (exp->sf_rpc == SPTLRPC_FLVR_ANY || exp->sf_rpc == flvr->sf_rpc)
+               return 1;
 
-        if ((req->rq_ctx_init || req->rq_ctx_fini) &&
-            SPTLRPC_FLVR_POLICY(exp->sf_rpc) ==
-            SPTLRPC_FLVR_POLICY(flvr->sf_rpc) &&
-            SPTLRPC_FLVR_MECH(exp->sf_rpc) == SPTLRPC_FLVR_MECH(flvr->sf_rpc))
-                return 1;
+       if ((req->rq_ctx_init || req->rq_ctx_fini) &&
+           SPTLRPC_FLVR_POLICY(exp->sf_rpc) ==
+           SPTLRPC_FLVR_POLICY(flvr->sf_rpc) &&
+           SPTLRPC_FLVR_MECH(exp->sf_rpc) == SPTLRPC_FLVR_MECH(flvr->sf_rpc))
+               return 1;
 
-        return 0;
+       return 0;
 }
 
 #define EXP_FLVR_UPDATE_EXPIRE      (OBD_TIMEOUT_DEFAULT + 10)
@@ -1783,52 +1918,58 @@ static int flavor_allowed(struct sptlrpc_flavor *exp,
  * changing configurations. Return 0 means success.
  */
 int sptlrpc_target_export_check(struct obd_export *exp,
-                                struct ptlrpc_request *req)
+                               struct ptlrpc_request *req)
 {
-        struct sptlrpc_flavor   flavor;
+       struct sptlrpc_flavor   flavor;
 
-        if (exp == NULL)
-                return 0;
+       if (exp == NULL)
+               return 0;
 
-        /* client side export has no imp_reverse, skip
-         * FIXME maybe we should check flavor this as well??? */
-        if (exp->exp_imp_reverse == NULL)
-                return 0;
+       /*
+        * client side export has no imp_reverse, skip
+        * FIXME maybe we should check flavor this as well???
+        */
+       if (exp->exp_imp_reverse == NULL)
+               return 0;
 
-        /* don't care about ctx fini rpc */
-        if (req->rq_ctx_fini)
-                return 0;
+       /* don't care about ctx fini rpc */
+       if (req->rq_ctx_fini)
+               return 0;
 
        spin_lock(&exp->exp_lock);
 
-        /* if flavor just changed (exp->exp_flvr_changed != 0), we wait for
-         * the first req with the new flavor, then treat it as current flavor,
-         * adapt reverse sec according to it.
-         * note the first rpc with new flavor might not be with root ctx, in
-         * which case delay the sec_adapt by leaving exp_flvr_adapt == 1. */
-        if (unlikely(exp->exp_flvr_changed) &&
-            flavor_allowed(&exp->exp_flvr_old[1], req)) {
-                /* make the new flavor as "current", and old ones as
-                 * about-to-expire */
-                CDEBUG(D_SEC, "exp %p: just changed: %x->%x\n", exp,
-                       exp->exp_flvr.sf_rpc, exp->exp_flvr_old[1].sf_rpc);
-                flavor = exp->exp_flvr_old[1];
-                exp->exp_flvr_old[1] = exp->exp_flvr_old[0];
-                exp->exp_flvr_expire[1] = exp->exp_flvr_expire[0];
-                exp->exp_flvr_old[0] = exp->exp_flvr;
-                exp->exp_flvr_expire[0] = cfs_time_current_sec() +
-                                          EXP_FLVR_UPDATE_EXPIRE;
-                exp->exp_flvr = flavor;
-
-                /* flavor change finished */
-                exp->exp_flvr_changed = 0;
-                LASSERT(exp->exp_flvr_adapt == 1);
-
-                /* if it's gss, we only interested in root ctx init */
-                if (req->rq_auth_gss &&
-                    !(req->rq_ctx_init &&
-                      (req->rq_auth_usr_root || req->rq_auth_usr_mdt ||
-                       req->rq_auth_usr_ost))) {
+       /*
+        * if flavor just changed (exp->exp_flvr_changed != 0), we wait for
+        * the first req with the new flavor, then treat it as current flavor,
+        * adapt reverse sec according to it.
+        * note the first rpc with new flavor might not be with root ctx, in
+        * which case delay the sec_adapt by leaving exp_flvr_adapt == 1.
+        */
+       if (unlikely(exp->exp_flvr_changed) &&
+           flavor_allowed(&exp->exp_flvr_old[1], req)) {
+               /*
+                * make the new flavor as "current", and old ones as
+                * about-to-expire
+                */
+               CDEBUG(D_SEC, "exp %p: just changed: %x->%x\n", exp,
+                      exp->exp_flvr.sf_rpc, exp->exp_flvr_old[1].sf_rpc);
+               flavor = exp->exp_flvr_old[1];
+               exp->exp_flvr_old[1] = exp->exp_flvr_old[0];
+               exp->exp_flvr_expire[1] = exp->exp_flvr_expire[0];
+               exp->exp_flvr_old[0] = exp->exp_flvr;
+               exp->exp_flvr_expire[0] = ktime_get_real_seconds() +
+                                         EXP_FLVR_UPDATE_EXPIRE;
+               exp->exp_flvr = flavor;
+
+               /* flavor change finished */
+               exp->exp_flvr_changed = 0;
+               LASSERT(exp->exp_flvr_adapt == 1);
+
+               /* if it's gss, we only interested in root ctx init */
+               if (req->rq_auth_gss &&
+                   !(req->rq_ctx_init &&
+                   (req->rq_auth_usr_root || req->rq_auth_usr_mdt ||
+                   req->rq_auth_usr_ost))) {
                        spin_unlock(&exp->exp_lock);
                        CDEBUG(D_SEC, "is good but not root(%d:%d:%d:%d:%d)\n",
                               req->rq_auth_gss, req->rq_ctx_init,
@@ -1840,25 +1981,31 @@ int sptlrpc_target_export_check(struct obd_export *exp,
                exp->exp_flvr_adapt = 0;
                spin_unlock(&exp->exp_lock);
 
-                return sptlrpc_import_sec_adapt(exp->exp_imp_reverse,
-                                                req->rq_svc_ctx, &flavor);
-        }
-
-        /* if it equals to the current flavor, we accept it, but need to
-         * dealing with reverse sec/ctx */
-        if (likely(flavor_allowed(&exp->exp_flvr, req))) {
-                /* most cases should return here, we only interested in
-                 * gss root ctx init */
-                if (!req->rq_auth_gss || !req->rq_ctx_init ||
-                    (!req->rq_auth_usr_root && !req->rq_auth_usr_mdt &&
-                     !req->rq_auth_usr_ost)) {
+               return sptlrpc_import_sec_adapt(exp->exp_imp_reverse,
+                                               req->rq_svc_ctx, &flavor);
+       }
+
+       /*
+        * if it equals to the current flavor, we accept it, but need to
+        * dealing with reverse sec/ctx
+        */
+       if (likely(flavor_allowed(&exp->exp_flvr, req))) {
+               /*
+                * most cases should return here, we only interested in
+                * gss root ctx init
+                */
+               if (!req->rq_auth_gss || !req->rq_ctx_init ||
+                   (!req->rq_auth_usr_root && !req->rq_auth_usr_mdt &&
+                    !req->rq_auth_usr_ost)) {
                        spin_unlock(&exp->exp_lock);
                        return 0;
                }
 
-               /* if flavor just changed, we should not proceed, just leave
+               /*
+                * if flavor just changed, we should not proceed, just leave
                 * it and current flavor will be discovered and replaced
-                * shortly, and let _this_ rpc pass through */
+                * shortly, and let _this_ rpc pass through
+                */
                if (exp->exp_flvr_changed) {
                        LASSERT(exp->exp_flvr_adapt);
                        spin_unlock(&exp->exp_lock);
@@ -1878,97 +2025,97 @@ int sptlrpc_target_export_check(struct obd_export *exp,
                                                        req->rq_svc_ctx,
                                                        &flavor);
                } else {
-                       CDEBUG(D_SEC, "exp %p (%x|%x|%x): is current flavor, "
-                              "install rvs ctx\n", exp, exp->exp_flvr.sf_rpc,
+                       CDEBUG(D_SEC,
+                              "exp %p (%x|%x|%x): is current flavor, install rvs ctx\n",
+                              exp, exp->exp_flvr.sf_rpc,
                               exp->exp_flvr_old[0].sf_rpc,
                               exp->exp_flvr_old[1].sf_rpc);
                        spin_unlock(&exp->exp_lock);
 
-                        return sptlrpc_svc_install_rvs_ctx(exp->exp_imp_reverse,
-                                                           req->rq_svc_ctx);
-                }
-        }
-
-        if (exp->exp_flvr_expire[0]) {
-                if (exp->exp_flvr_expire[0] >= cfs_time_current_sec()) {
-                        if (flavor_allowed(&exp->exp_flvr_old[0], req)) {
-                                CDEBUG(D_SEC, "exp %p (%x|%x|%x): match the "
-                                       "middle one ("CFS_DURATION_T")\n", exp,
-                                       exp->exp_flvr.sf_rpc,
-                                       exp->exp_flvr_old[0].sf_rpc,
-                                       exp->exp_flvr_old[1].sf_rpc,
-                                       exp->exp_flvr_expire[0] -
-                                                cfs_time_current_sec());
+                       return sptlrpc_svc_install_rvs_ctx(exp->exp_imp_reverse,
+                                                          req->rq_svc_ctx);
+               }
+       }
+
+       if (exp->exp_flvr_expire[0]) {
+               if (exp->exp_flvr_expire[0] >= ktime_get_real_seconds()) {
+                       if (flavor_allowed(&exp->exp_flvr_old[0], req)) {
+                               CDEBUG(D_SEC,
+                                      "exp %p (%x|%x|%x): match the middle one (%lld)\n",
+                                      exp, exp->exp_flvr.sf_rpc,
+                                      exp->exp_flvr_old[0].sf_rpc,
+                                      exp->exp_flvr_old[1].sf_rpc,
+                                      (s64)(exp->exp_flvr_expire[0] -
+                                            ktime_get_real_seconds()));
                                spin_unlock(&exp->exp_lock);
-                                return 0;
-                        }
-                } else {
-                        CDEBUG(D_SEC, "mark middle expired\n");
-                        exp->exp_flvr_expire[0] = 0;
-                }
-                CDEBUG(D_SEC, "exp %p (%x|%x|%x): %x not match middle\n", exp,
-                       exp->exp_flvr.sf_rpc,
-                       exp->exp_flvr_old[0].sf_rpc, exp->exp_flvr_old[1].sf_rpc,
-                       req->rq_flvr.sf_rpc);
-        }
-
-        /* now it doesn't match the current flavor, the only chance we can
-         * accept it is match the old flavors which is not expired. */
-        if (exp->exp_flvr_changed == 0 && exp->exp_flvr_expire[1]) {
-                if (exp->exp_flvr_expire[1] >= cfs_time_current_sec()) {
-                        if (flavor_allowed(&exp->exp_flvr_old[1], req)) {
-                                CDEBUG(D_SEC, "exp %p (%x|%x|%x): match the "
-                                       "oldest one ("CFS_DURATION_T")\n", exp,
-                                       exp->exp_flvr.sf_rpc,
-                                       exp->exp_flvr_old[0].sf_rpc,
-                                       exp->exp_flvr_old[1].sf_rpc,
-                                       exp->exp_flvr_expire[1] -
-                                                cfs_time_current_sec());
+                               return 0;
+                       }
+               } else {
+                       CDEBUG(D_SEC, "mark middle expired\n");
+                       exp->exp_flvr_expire[0] = 0;
+               }
+               CDEBUG(D_SEC, "exp %p (%x|%x|%x): %x not match middle\n", exp,
+                      exp->exp_flvr.sf_rpc,
+                      exp->exp_flvr_old[0].sf_rpc, exp->exp_flvr_old[1].sf_rpc,
+                      req->rq_flvr.sf_rpc);
+       }
+
+       /*
+        * now it doesn't match the current flavor, the only chance we can
+        * accept it is match the old flavors which is not expired.
+        */
+       if (exp->exp_flvr_changed == 0 && exp->exp_flvr_expire[1]) {
+               if (exp->exp_flvr_expire[1] >= ktime_get_real_seconds()) {
+                       if (flavor_allowed(&exp->exp_flvr_old[1], req)) {
+                               CDEBUG(D_SEC, "exp %p (%x|%x|%x): match the oldest one (%lld)\n",
+                                      exp,
+                                      exp->exp_flvr.sf_rpc,
+                                      exp->exp_flvr_old[0].sf_rpc,
+                                      exp->exp_flvr_old[1].sf_rpc,
+                                      (s64)(exp->exp_flvr_expire[1] -
+                                      ktime_get_real_seconds()));
                                spin_unlock(&exp->exp_lock);
-                                return 0;
-                        }
-                } else {
-                        CDEBUG(D_SEC, "mark oldest expired\n");
-                        exp->exp_flvr_expire[1] = 0;
-                }
-                CDEBUG(D_SEC, "exp %p (%x|%x|%x): %x not match found\n",
-                       exp, exp->exp_flvr.sf_rpc,
-                       exp->exp_flvr_old[0].sf_rpc, exp->exp_flvr_old[1].sf_rpc,
-                       req->rq_flvr.sf_rpc);
-        } else {
-                CDEBUG(D_SEC, "exp %p (%x|%x|%x): skip the last one\n",
-                       exp, exp->exp_flvr.sf_rpc, exp->exp_flvr_old[0].sf_rpc,
-                       exp->exp_flvr_old[1].sf_rpc);
-        }
+                               return 0;
+                       }
+               } else {
+                       CDEBUG(D_SEC, "mark oldest expired\n");
+                       exp->exp_flvr_expire[1] = 0;
+               }
+               CDEBUG(D_SEC, "exp %p (%x|%x|%x): %x not match found\n",
+                      exp, exp->exp_flvr.sf_rpc,
+                      exp->exp_flvr_old[0].sf_rpc, exp->exp_flvr_old[1].sf_rpc,
+                      req->rq_flvr.sf_rpc);
+       } else {
+               CDEBUG(D_SEC, "exp %p (%x|%x|%x): skip the last one\n",
+                      exp, exp->exp_flvr.sf_rpc, exp->exp_flvr_old[0].sf_rpc,
+                      exp->exp_flvr_old[1].sf_rpc);
+       }
 
        spin_unlock(&exp->exp_lock);
 
-        CWARN("exp %p(%s): req %p (%u|%u|%u|%u|%u|%u) with "
-              "unauthorized flavor %x, expect %x|%x(%+ld)|%x(%+ld)\n",
-              exp, exp->exp_obd->obd_name,
-              req, req->rq_auth_gss, req->rq_ctx_init, req->rq_ctx_fini,
-              req->rq_auth_usr_root, req->rq_auth_usr_mdt, req->rq_auth_usr_ost,
-              req->rq_flvr.sf_rpc,
-              exp->exp_flvr.sf_rpc,
-              exp->exp_flvr_old[0].sf_rpc,
-              exp->exp_flvr_expire[0] ?
-              (unsigned long) (exp->exp_flvr_expire[0] -
-                               cfs_time_current_sec()) : 0,
-              exp->exp_flvr_old[1].sf_rpc,
-              exp->exp_flvr_expire[1] ?
-              (unsigned long) (exp->exp_flvr_expire[1] -
-                               cfs_time_current_sec()) : 0);
-        return -EACCES;
+       CWARN("exp %p(%s): req %p (%u|%u|%u|%u|%u|%u) with unauthorized flavor %x, expect %x|%x(%+lld)|%x(%+lld)\n",
+             exp, exp->exp_obd->obd_name,
+             req, req->rq_auth_gss, req->rq_ctx_init, req->rq_ctx_fini,
+             req->rq_auth_usr_root, req->rq_auth_usr_mdt, req->rq_auth_usr_ost,
+             req->rq_flvr.sf_rpc,
+             exp->exp_flvr.sf_rpc,
+             exp->exp_flvr_old[0].sf_rpc,
+             exp->exp_flvr_expire[0] ?
+             (s64)(exp->exp_flvr_expire[0] - ktime_get_real_seconds()) : 0,
+             exp->exp_flvr_old[1].sf_rpc,
+             exp->exp_flvr_expire[1] ?
+             (s64)(exp->exp_flvr_expire[1] - ktime_get_real_seconds()) : 0);
+       return -EACCES;
 }
 EXPORT_SYMBOL(sptlrpc_target_export_check);
 
 void sptlrpc_target_update_exp_flavor(struct obd_device *obd,
-                                      struct sptlrpc_rule_set *rset)
+                                     struct sptlrpc_rule_set *rset)
 {
-        struct obd_export       *exp;
-        struct sptlrpc_flavor    new_flvr;
+       struct obd_export *exp;
+       struct sptlrpc_flavor new_flvr;
 
-        LASSERT(obd);
+       LASSERT(obd);
 
        spin_lock(&obd->obd_dev_lock);
 
@@ -1976,25 +2123,27 @@ void sptlrpc_target_update_exp_flavor(struct obd_device *obd,
                if (exp->exp_connection == NULL)
                        continue;
 
-               /* note if this export had just been updated flavor
+               /*
+                * note if this export had just been updated flavor
                 * (exp_flvr_changed == 1), this will override the
-                * previous one. */
+                * previous one.
+                */
                spin_lock(&exp->exp_lock);
-                sptlrpc_target_choose_flavor(rset, exp->exp_sp_peer,
-                                             exp->exp_connection->c_peer.nid,
-                                             &new_flvr);
-                if (exp->exp_flvr_changed ||
-                    !flavor_equal(&new_flvr, &exp->exp_flvr)) {
-                        exp->exp_flvr_old[1] = new_flvr;
-                        exp->exp_flvr_expire[1] = 0;
-                        exp->exp_flvr_changed = 1;
-                        exp->exp_flvr_adapt = 1;
-
-                        CDEBUG(D_SEC, "exp %p (%s): updated flavor %x->%x\n",
-                               exp, sptlrpc_part2name(exp->exp_sp_peer),
-                               exp->exp_flvr.sf_rpc,
-                               exp->exp_flvr_old[1].sf_rpc);
-                }
+               sptlrpc_target_choose_flavor(rset, exp->exp_sp_peer,
+                                            exp->exp_connection->c_peer.nid,
+                                            &new_flvr);
+               if (exp->exp_flvr_changed ||
+                   !flavor_equal(&new_flvr, &exp->exp_flvr)) {
+                       exp->exp_flvr_old[1] = new_flvr;
+                       exp->exp_flvr_expire[1] = 0;
+                       exp->exp_flvr_changed = 1;
+                       exp->exp_flvr_adapt = 1;
+
+                       CDEBUG(D_SEC, "exp %p (%s): updated flavor %x->%x\n",
+                              exp, sptlrpc_part2name(exp->exp_sp_peer),
+                              exp->exp_flvr.sf_rpc,
+                              exp->exp_flvr_old[1].sf_rpc);
+               }
                spin_unlock(&exp->exp_lock);
        }
 
@@ -2004,49 +2153,53 @@ EXPORT_SYMBOL(sptlrpc_target_update_exp_flavor);
 
 static int sptlrpc_svc_check_from(struct ptlrpc_request *req, int svc_rc)
 {
-        /* peer's claim is unreliable unless gss is being used */
-        if (!req->rq_auth_gss || svc_rc == SECSVC_DROP)
-                return svc_rc;
-
-        switch (req->rq_sp_from) {
-        case LUSTRE_SP_CLI:
-                if (req->rq_auth_usr_mdt || req->rq_auth_usr_ost) {
-                        DEBUG_REQ(D_ERROR, req, "faked source CLI");
-                        svc_rc = SECSVC_DROP;
-                }
-                break;
-        case LUSTRE_SP_MDT:
-                if (!req->rq_auth_usr_mdt) {
-                        DEBUG_REQ(D_ERROR, req, "faked source MDT");
-                        svc_rc = SECSVC_DROP;
-                }
-                break;
-        case LUSTRE_SP_OST:
-                if (!req->rq_auth_usr_ost) {
-                        DEBUG_REQ(D_ERROR, req, "faked source OST");
-                        svc_rc = SECSVC_DROP;
-                }
-                break;
-        case LUSTRE_SP_MGS:
-        case LUSTRE_SP_MGC:
-                if (!req->rq_auth_usr_root && !req->rq_auth_usr_mdt &&
-                    !req->rq_auth_usr_ost) {
-                        DEBUG_REQ(D_ERROR, req, "faked source MGC/MGS");
-                        svc_rc = SECSVC_DROP;
-                }
-                break;
-        case LUSTRE_SP_ANY:
-        default:
-                DEBUG_REQ(D_ERROR, req, "invalid source %u", req->rq_sp_from);
-                svc_rc = SECSVC_DROP;
-        }
-
-        return svc_rc;
+       /* peer's claim is unreliable unless gss is being used */
+       if (!req->rq_auth_gss || svc_rc == SECSVC_DROP)
+               return svc_rc;
+
+       switch (req->rq_sp_from) {
+       case LUSTRE_SP_CLI:
+               if (req->rq_auth_usr_mdt || req->rq_auth_usr_ost) {
+                       /* The below message is checked in sanity-sec test_33 */
+                       DEBUG_REQ(D_ERROR, req, "faked source CLI");
+                       svc_rc = SECSVC_DROP;
+               }
+               break;
+       case LUSTRE_SP_MDT:
+               if (!req->rq_auth_usr_mdt) {
+                       /* The below message is checked in sanity-sec test_33 */
+                       DEBUG_REQ(D_ERROR, req, "faked source MDT");
+                       svc_rc = SECSVC_DROP;
+               }
+               break;
+       case LUSTRE_SP_OST:
+               if (!req->rq_auth_usr_ost) {
+                       /* The below message is checked in sanity-sec test_33 */
+                       DEBUG_REQ(D_ERROR, req, "faked source OST");
+                       svc_rc = SECSVC_DROP;
+               }
+               break;
+       case LUSTRE_SP_MGS:
+       case LUSTRE_SP_MGC:
+               if (!req->rq_auth_usr_root && !req->rq_auth_usr_mdt &&
+                   !req->rq_auth_usr_ost) {
+                       /* The below message is checked in sanity-sec test_33 */
+                       DEBUG_REQ(D_ERROR, req, "faked source MGC/MGS");
+                       svc_rc = SECSVC_DROP;
+               }
+               break;
+       case LUSTRE_SP_ANY:
+       default:
+               DEBUG_REQ(D_ERROR, req, "invalid source %u", req->rq_sp_from);
+               svc_rc = SECSVC_DROP;
+       }
+
+       return svc_rc;
 }
 
 /**
  * Used by ptlrpc server, to perform transformation upon request message of
- * incoming \a req. This must be the first thing to do with a incoming
+ * incoming \a req. This must be the first thing to do with an incoming
  * request in ptlrpc layer.
  *
  * \retval SECSVC_OK success, and req->rq_reqmsg point to request message in
@@ -2057,57 +2210,58 @@ static int sptlrpc_svc_check_from(struct ptlrpc_request *req, int svc_rc)
  */
 int sptlrpc_svc_unwrap_request(struct ptlrpc_request *req)
 {
-        struct ptlrpc_sec_policy *policy;
-        struct lustre_msg        *msg = req->rq_reqbuf;
-        int                       rc;
-        ENTRY;
-
-        LASSERT(msg);
-        LASSERT(req->rq_reqmsg == NULL);
-        LASSERT(req->rq_repmsg == NULL);
-        LASSERT(req->rq_svc_ctx == NULL);
-
-        req->rq_req_swab_mask = 0;
-
-        rc = __lustre_unpack_msg(msg, req->rq_reqdata_len);
-        switch (rc) {
-        case 1:
-                lustre_set_req_swabbed(req, MSG_PTLRPC_HEADER_OFF);
-        case 0:
-                break;
-        default:
-                CERROR("error unpacking request from %s x"LPU64"\n",
-                       libcfs_id2str(req->rq_peer), req->rq_xid);
-                RETURN(SECSVC_DROP);
-        }
-
-        req->rq_flvr.sf_rpc = WIRE_FLVR(msg->lm_secflvr);
-        req->rq_sp_from = LUSTRE_SP_ANY;
-       req->rq_auth_uid = -1;          /* set to INVALID_UID */
-       req->rq_auth_mapped_uid = -1;
+       struct ptlrpc_sec_policy *policy;
+       struct lustre_msg *msg = req->rq_reqbuf;
+       int rc;
 
-        policy = sptlrpc_wireflavor2policy(req->rq_flvr.sf_rpc);
-        if (!policy) {
-                CERROR("unsupported rpc flavor %x\n", req->rq_flvr.sf_rpc);
-                RETURN(SECSVC_DROP);
-        }
+       ENTRY;
 
-        LASSERT(policy->sp_sops->accept);
-        rc = policy->sp_sops->accept(req);
-        sptlrpc_policy_put(policy);
-        LASSERT(req->rq_reqmsg || rc != SECSVC_OK);
-        LASSERT(req->rq_svc_ctx || rc == SECSVC_DROP);
+       LASSERT(msg);
+       LASSERT(req->rq_reqmsg == NULL);
+       LASSERT(req->rq_repmsg == NULL);
+       LASSERT(req->rq_svc_ctx == NULL);
+
+       req->rq_req_swab_mask = 0;
+
+       rc = __lustre_unpack_msg(msg, req->rq_reqdata_len);
+       switch (rc) {
+       case 1:
+               lustre_set_req_swabbed(req, MSG_PTLRPC_HEADER_OFF);
+       case 0:
+               break;
+       default:
+               CERROR("error unpacking request from %s x%llu\n",
+                      libcfs_id2str(req->rq_peer), req->rq_xid);
+               RETURN(SECSVC_DROP);
+       }
 
-        /*
-         * if it's not null flavor (which means embedded packing msg),
-         * reset the swab mask for the comming inner msg unpacking.
-         */
-        if (SPTLRPC_FLVR_POLICY(req->rq_flvr.sf_rpc) != SPTLRPC_POLICY_NULL)
-                req->rq_req_swab_mask = 0;
+       req->rq_flvr.sf_rpc = WIRE_FLVR(msg->lm_secflvr);
+       req->rq_sp_from = LUSTRE_SP_ANY;
+       req->rq_auth_uid = -1; /* set to INVALID_UID */
+       req->rq_auth_mapped_uid = -1;
 
-        /* sanity check for the request source */
-        rc = sptlrpc_svc_check_from(req, rc);
-        RETURN(rc);
+       policy = sptlrpc_wireflavor2policy(req->rq_flvr.sf_rpc);
+       if (!policy) {
+               CERROR("unsupported rpc flavor %x\n", req->rq_flvr.sf_rpc);
+               RETURN(SECSVC_DROP);
+       }
+
+       LASSERT(policy->sp_sops->accept);
+       rc = policy->sp_sops->accept(req);
+       sptlrpc_policy_put(policy);
+       LASSERT(req->rq_reqmsg || rc != SECSVC_OK);
+       LASSERT(req->rq_svc_ctx || rc == SECSVC_DROP);
+
+       /*
+        * if it's not null flavor (which means embedded packing msg),
+        * reset the swab mask for the comming inner msg unpacking.
+        */
+       if (SPTLRPC_FLVR_POLICY(req->rq_flvr.sf_rpc) != SPTLRPC_POLICY_NULL)
+               req->rq_req_swab_mask = 0;
+
+       /* sanity check for the request source */
+       rc = sptlrpc_svc_check_from(req, rc);
+       RETURN(rc);
 }
 
 /**
@@ -2117,20 +2271,22 @@ int sptlrpc_svc_unwrap_request(struct ptlrpc_request *req)
  */
 int sptlrpc_svc_alloc_rs(struct ptlrpc_request *req, int msglen)
 {
-        struct ptlrpc_sec_policy *policy;
-        struct ptlrpc_reply_state *rs;
-        int rc;
-        ENTRY;
+       struct ptlrpc_sec_policy *policy;
+       struct ptlrpc_reply_state *rs;
+       int rc;
 
-        LASSERT(req->rq_svc_ctx);
-        LASSERT(req->rq_svc_ctx->sc_policy);
+       ENTRY;
 
-        policy = req->rq_svc_ctx->sc_policy;
-        LASSERT(policy->sp_sops->alloc_rs);
+       LASSERT(req->rq_svc_ctx);
+       LASSERT(req->rq_svc_ctx->sc_policy);
 
-        rc = policy->sp_sops->alloc_rs(req, msglen);
-        if (unlikely(rc == -ENOMEM)) {
+       policy = req->rq_svc_ctx->sc_policy;
+       LASSERT(policy->sp_sops->alloc_rs);
+
+       rc = policy->sp_sops->alloc_rs(req, msglen);
+       if (unlikely(rc == -ENOMEM)) {
                struct ptlrpc_service_part *svcpt = req->rq_rqbd->rqbd_svcpt;
+
                if (svcpt->scp_service->srv_max_reply_size <
                   msglen + sizeof(struct ptlrpc_reply_state)) {
                        /* Just return failure if the size is too big */
@@ -2140,23 +2296,23 @@ int sptlrpc_svc_alloc_rs(struct ptlrpc_request *req, int msglen)
                        RETURN(-ENOMEM);
                }
 
-                /* failed alloc, try emergency pool */
+               /* failed alloc, try emergency pool */
                rs = lustre_get_emerg_rs(svcpt);
-                if (rs == NULL)
-                        RETURN(-ENOMEM);
+               if (rs == NULL)
+                       RETURN(-ENOMEM);
 
-                req->rq_reply_state = rs;
-                rc = policy->sp_sops->alloc_rs(req, msglen);
-                if (rc) {
-                        lustre_put_emerg_rs(rs);
-                        req->rq_reply_state = NULL;
-                }
-        }
+               req->rq_reply_state = rs;
+               rc = policy->sp_sops->alloc_rs(req, msglen);
+               if (rc) {
+                       lustre_put_emerg_rs(rs);
+                       req->rq_reply_state = NULL;
+               }
+       }
 
-        LASSERT(rc != 0 ||
-                (req->rq_reply_state && req->rq_reply_state->rs_msg));
+       LASSERT(rc != 0 ||
+               (req->rq_reply_state && req->rq_reply_state->rs_msg));
 
-        RETURN(rc);
+       RETURN(rc);
 }
 
 /**
@@ -2167,20 +2323,21 @@ int sptlrpc_svc_alloc_rs(struct ptlrpc_request *req, int msglen)
  */
 int sptlrpc_svc_wrap_reply(struct ptlrpc_request *req)
 {
-        struct ptlrpc_sec_policy *policy;
-        int rc;
-        ENTRY;
+       struct ptlrpc_sec_policy *policy;
+       int rc;
+
+       ENTRY;
 
-        LASSERT(req->rq_svc_ctx);
-        LASSERT(req->rq_svc_ctx->sc_policy);
+       LASSERT(req->rq_svc_ctx);
+       LASSERT(req->rq_svc_ctx->sc_policy);
 
-        policy = req->rq_svc_ctx->sc_policy;
-        LASSERT(policy->sp_sops->authorize);
+       policy = req->rq_svc_ctx->sc_policy;
+       LASSERT(policy->sp_sops->authorize);
 
-        rc = policy->sp_sops->authorize(req);
-        LASSERT(rc || req->rq_reply_state->rs_repdata_len);
+       rc = policy->sp_sops->authorize(req);
+       LASSERT(rc || req->rq_reply_state->rs_repdata_len);
 
-        RETURN(rc);
+       RETURN(rc);
 }
 
 /**
@@ -2188,22 +2345,23 @@ int sptlrpc_svc_wrap_reply(struct ptlrpc_request *req)
  */
 void sptlrpc_svc_free_rs(struct ptlrpc_reply_state *rs)
 {
-        struct ptlrpc_sec_policy *policy;
-        unsigned int prealloc;
-        ENTRY;
+       struct ptlrpc_sec_policy *policy;
+       unsigned int prealloc;
 
-        LASSERT(rs->rs_svc_ctx);
-        LASSERT(rs->rs_svc_ctx->sc_policy);
+       ENTRY;
+
+       LASSERT(rs->rs_svc_ctx);
+       LASSERT(rs->rs_svc_ctx->sc_policy);
 
-        policy = rs->rs_svc_ctx->sc_policy;
-        LASSERT(policy->sp_sops->free_rs);
+       policy = rs->rs_svc_ctx->sc_policy;
+       LASSERT(policy->sp_sops->free_rs);
 
-        prealloc = rs->rs_prealloc;
-        policy->sp_sops->free_rs(rs);
+       prealloc = rs->rs_prealloc;
+       policy->sp_sops->free_rs(rs);
 
-        if (prealloc)
-                lustre_put_emerg_rs(rs);
-        EXIT;
+       if (prealloc)
+               lustre_put_emerg_rs(rs);
+       EXIT;
 }
 
 void sptlrpc_svc_ctx_addref(struct ptlrpc_request *req)
@@ -2231,39 +2389,39 @@ void sptlrpc_svc_ctx_decref(struct ptlrpc_request *req)
 
 void sptlrpc_svc_ctx_invalidate(struct ptlrpc_request *req)
 {
-        struct ptlrpc_svc_ctx *ctx = req->rq_svc_ctx;
+       struct ptlrpc_svc_ctx *ctx = req->rq_svc_ctx;
 
-        if (ctx == NULL)
-                return;
+       if (ctx == NULL)
+               return;
 
-        LASSERT_ATOMIC_POS(&ctx->sc_refcount);
-        if (ctx->sc_policy->sp_sops->invalidate_ctx)
-                ctx->sc_policy->sp_sops->invalidate_ctx(ctx);
+       LASSERT_ATOMIC_POS(&ctx->sc_refcount);
+       if (ctx->sc_policy->sp_sops->invalidate_ctx)
+               ctx->sc_policy->sp_sops->invalidate_ctx(ctx);
 }
 EXPORT_SYMBOL(sptlrpc_svc_ctx_invalidate);
 
-/****************************************
- * bulk security                        *
- ****************************************/
+/*
+ * bulk security
+ */
 
 /**
  * Perform transformation upon bulk data pointed by \a desc. This is called
  * before transforming the request message.
  */
 int sptlrpc_cli_wrap_bulk(struct ptlrpc_request *req,
-                          struct ptlrpc_bulk_desc *desc)
+                         struct ptlrpc_bulk_desc *desc)
 {
-        struct ptlrpc_cli_ctx *ctx;
+       struct ptlrpc_cli_ctx *ctx;
 
-        LASSERT(req->rq_bulk_read || req->rq_bulk_write);
+       LASSERT(req->rq_bulk_read || req->rq_bulk_write);
 
-        if (!req->rq_pack_bulk)
-                return 0;
+       if (!req->rq_pack_bulk)
+               return 0;
 
-        ctx = req->rq_cli_ctx;
-        if (ctx->cc_ops->wrap_bulk)
-                return ctx->cc_ops->wrap_bulk(ctx, req, desc);
-        return 0;
+       ctx = req->rq_cli_ctx;
+       if (ctx->cc_ops->wrap_bulk)
+               return ctx->cc_ops->wrap_bulk(ctx, req, desc);
+       return 0;
 }
 EXPORT_SYMBOL(sptlrpc_cli_wrap_bulk);
 
@@ -2272,24 +2430,24 @@ EXPORT_SYMBOL(sptlrpc_cli_wrap_bulk);
  * return nob of actual plain text size received, or error code.
  */
 int sptlrpc_cli_unwrap_bulk_read(struct ptlrpc_request *req,
-                                 struct ptlrpc_bulk_desc *desc,
-                                 int nob)
+                                struct ptlrpc_bulk_desc *desc,
+                                int nob)
 {
-        struct ptlrpc_cli_ctx  *ctx;
-        int                     rc;
+       struct ptlrpc_cli_ctx *ctx;
+       int rc;
 
-        LASSERT(req->rq_bulk_read && !req->rq_bulk_write);
+       LASSERT(req->rq_bulk_read && !req->rq_bulk_write);
 
-        if (!req->rq_pack_bulk)
-                return desc->bd_nob_transferred;
+       if (!req->rq_pack_bulk)
+               return desc->bd_nob_transferred;
 
-        ctx = req->rq_cli_ctx;
-        if (ctx->cc_ops->unwrap_bulk) {
-                rc = ctx->cc_ops->unwrap_bulk(ctx, req, desc);
-                if (rc < 0)
-                        return rc;
-        }
-        return desc->bd_nob_transferred;
+       ctx = req->rq_cli_ctx;
+       if (ctx->cc_ops->unwrap_bulk) {
+               rc = ctx->cc_ops->unwrap_bulk(ctx, req, desc);
+               if (rc < 0)
+                       return rc;
+       }
+       return desc->bd_nob_transferred;
 }
 EXPORT_SYMBOL(sptlrpc_cli_unwrap_bulk_read);
 
@@ -2298,28 +2456,28 @@ EXPORT_SYMBOL(sptlrpc_cli_unwrap_bulk_read);
  * return 0 for success or error code.
  */
 int sptlrpc_cli_unwrap_bulk_write(struct ptlrpc_request *req,
-                                  struct ptlrpc_bulk_desc *desc)
+                                 struct ptlrpc_bulk_desc *desc)
 {
-        struct ptlrpc_cli_ctx  *ctx;
-        int                     rc;
+       struct ptlrpc_cli_ctx *ctx;
+       int rc;
 
-        LASSERT(!req->rq_bulk_read && req->rq_bulk_write);
+       LASSERT(!req->rq_bulk_read && req->rq_bulk_write);
 
-        if (!req->rq_pack_bulk)
-                return 0;
+       if (!req->rq_pack_bulk)
+               return 0;
 
-        ctx = req->rq_cli_ctx;
-        if (ctx->cc_ops->unwrap_bulk) {
-                rc = ctx->cc_ops->unwrap_bulk(ctx, req, desc);
-                if (rc < 0)
-                        return rc;
-        }
+       ctx = req->rq_cli_ctx;
+       if (ctx->cc_ops->unwrap_bulk) {
+               rc = ctx->cc_ops->unwrap_bulk(ctx, req, desc);
+               if (rc < 0)
+                       return rc;
+       }
 
-        /*
-         * if everything is going right, nob should equals to nob_transferred.
-         * in case of privacy mode, nob_transferred needs to be adjusted.
-         */
-        if (desc->bd_nob != desc->bd_nob_transferred) {
+       /*
+        * if everything is going right, nob should equals to nob_transferred.
+        * in case of privacy mode, nob_transferred needs to be adjusted.
+        */
+       if (desc->bd_nob != desc->bd_nob_transferred) {
                CERROR("nob %d doesn't match transferred nob %d\n",
                       desc->bd_nob, desc->bd_nob_transferred);
                return -EPROTO;
@@ -2334,20 +2492,20 @@ EXPORT_SYMBOL(sptlrpc_cli_unwrap_bulk_write);
  * Performe transformation upon outgoing bulk read.
  */
 int sptlrpc_svc_wrap_bulk(struct ptlrpc_request *req,
-                          struct ptlrpc_bulk_desc *desc)
+                         struct ptlrpc_bulk_desc *desc)
 {
-        struct ptlrpc_svc_ctx *ctx;
+       struct ptlrpc_svc_ctx *ctx;
 
-        LASSERT(req->rq_bulk_read);
+       LASSERT(req->rq_bulk_read);
 
-        if (!req->rq_pack_bulk)
-                return 0;
+       if (!req->rq_pack_bulk)
+               return 0;
 
-        ctx = req->rq_svc_ctx;
-        if (ctx->sc_policy->sp_sops->wrap_bulk)
-                return ctx->sc_policy->sp_sops->wrap_bulk(req, desc);
+       ctx = req->rq_svc_ctx;
+       if (ctx->sc_policy->sp_sops->wrap_bulk)
+               return ctx->sc_policy->sp_sops->wrap_bulk(req, desc);
 
-        return 0;
+       return 0;
 }
 EXPORT_SYMBOL(sptlrpc_svc_wrap_bulk);
 
@@ -2355,38 +2513,38 @@ EXPORT_SYMBOL(sptlrpc_svc_wrap_bulk);
  * Performe transformation upon incoming bulk write.
  */
 int sptlrpc_svc_unwrap_bulk(struct ptlrpc_request *req,
-                            struct ptlrpc_bulk_desc *desc)
-{
-        struct ptlrpc_svc_ctx *ctx;
-        int                    rc;
-
-        LASSERT(req->rq_bulk_write);
-
-        /*
-         * if it's in privacy mode, transferred should >= expected; otherwise
-         * transferred should == expected.
-         */
-        if (desc->bd_nob_transferred < desc->bd_nob ||
-            (desc->bd_nob_transferred > desc->bd_nob &&
-             SPTLRPC_FLVR_BULK_SVC(req->rq_flvr.sf_rpc) !=
-             SPTLRPC_BULK_SVC_PRIV)) {
-                DEBUG_REQ(D_ERROR, req, "truncated bulk GET %d(%d)",
-                          desc->bd_nob_transferred, desc->bd_nob);
-                return -ETIMEDOUT;
-        }
-
-        if (!req->rq_pack_bulk)
-                return 0;
-
-        ctx = req->rq_svc_ctx;
-        if (ctx->sc_policy->sp_sops->unwrap_bulk) {
-                rc = ctx->sc_policy->sp_sops->unwrap_bulk(req, desc);
-                if (rc)
-                        CERROR("error unwrap bulk: %d\n", rc);
-        }
-
-        /* return 0 to allow reply be sent */
-        return 0;
+                           struct ptlrpc_bulk_desc *desc)
+{
+       struct ptlrpc_svc_ctx *ctx;
+       int rc;
+
+       LASSERT(req->rq_bulk_write);
+
+       /*
+        * if it's in privacy mode, transferred should >= expected; otherwise
+        * transferred should == expected.
+        */
+       if (desc->bd_nob_transferred < desc->bd_nob ||
+           (desc->bd_nob_transferred > desc->bd_nob &&
+            SPTLRPC_FLVR_BULK_SVC(req->rq_flvr.sf_rpc) !=
+            SPTLRPC_BULK_SVC_PRIV)) {
+               DEBUG_REQ(D_ERROR, req, "truncated bulk GET %d(%d)",
+                         desc->bd_nob_transferred, desc->bd_nob);
+               return -ETIMEDOUT;
+       }
+
+       if (!req->rq_pack_bulk)
+               return 0;
+
+       ctx = req->rq_svc_ctx;
+       if (ctx->sc_policy->sp_sops->unwrap_bulk) {
+               rc = ctx->sc_policy->sp_sops->unwrap_bulk(req, desc);
+               if (rc)
+                       CERROR("error unwrap bulk: %d\n", rc);
+       }
+
+       /* return 0 to allow reply be sent */
+       return 0;
 }
 EXPORT_SYMBOL(sptlrpc_svc_unwrap_bulk);
 
@@ -2394,38 +2552,38 @@ EXPORT_SYMBOL(sptlrpc_svc_unwrap_bulk);
  * Prepare buffers for incoming bulk write.
  */
 int sptlrpc_svc_prep_bulk(struct ptlrpc_request *req,
-                          struct ptlrpc_bulk_desc *desc)
+                         struct ptlrpc_bulk_desc *desc)
 {
-        struct ptlrpc_svc_ctx *ctx;
+       struct ptlrpc_svc_ctx *ctx;
 
-        LASSERT(req->rq_bulk_write);
+       LASSERT(req->rq_bulk_write);
 
-        if (!req->rq_pack_bulk)
-                return 0;
+       if (!req->rq_pack_bulk)
+               return 0;
 
-        ctx = req->rq_svc_ctx;
-        if (ctx->sc_policy->sp_sops->prep_bulk)
-                return ctx->sc_policy->sp_sops->prep_bulk(req, desc);
+       ctx = req->rq_svc_ctx;
+       if (ctx->sc_policy->sp_sops->prep_bulk)
+               return ctx->sc_policy->sp_sops->prep_bulk(req, desc);
 
-        return 0;
+       return 0;
 }
 EXPORT_SYMBOL(sptlrpc_svc_prep_bulk);
 
 #endif /* HAVE_SERVER_SUPPORT */
 
-/****************************************
- * user descriptor helpers              *
- ****************************************/
+/*
+ * user descriptor helpers
+ */
 
 int sptlrpc_current_user_desc_size(void)
 {
-        int ngroups;
+       int ngroups;
 
-        ngroups = current_ngroups;
+       ngroups = current_ngroups;
 
-        if (ngroups > LUSTRE_MAX_GROUPS)
-                ngroups = LUSTRE_MAX_GROUPS;
-        return sptlrpc_user_desc_size(ngroups);
+       if (ngroups > LUSTRE_MAX_GROUPS)
+               ngroups = LUSTRE_MAX_GROUPS;
+       return sptlrpc_user_desc_size(ngroups);
 }
 EXPORT_SYMBOL(sptlrpc_current_user_desc_size);
 
@@ -2445,8 +2603,13 @@ int sptlrpc_pack_user_desc(struct lustre_msg *msg, int offset)
        task_lock(current);
        if (pud->pud_ngroups > current_ngroups)
                pud->pud_ngroups = current_ngroups;
+#ifdef HAVE_GROUP_INFO_GID
+       memcpy(pud->pud_groups, current_cred()->group_info->gid,
+              pud->pud_ngroups * sizeof(__u32));
+#else /* !HAVE_GROUP_INFO_GID */
        memcpy(pud->pud_groups, current_cred()->group_info->blocks[0],
               pud->pud_ngroups * sizeof(__u32));
+#endif /* HAVE_GROUP_INFO_GID */
        task_unlock(current);
 
        return 0;
@@ -2455,54 +2618,54 @@ EXPORT_SYMBOL(sptlrpc_pack_user_desc);
 
 int sptlrpc_unpack_user_desc(struct lustre_msg *msg, int offset, int swabbed)
 {
-        struct ptlrpc_user_desc *pud;
-        int                      i;
-
-        pud = lustre_msg_buf(msg, offset, sizeof(*pud));
-        if (!pud)
-                return -EINVAL;
-
-        if (swabbed) {
-                __swab32s(&pud->pud_uid);
-                __swab32s(&pud->pud_gid);
-                __swab32s(&pud->pud_fsuid);
-                __swab32s(&pud->pud_fsgid);
-                __swab32s(&pud->pud_cap);
-                __swab32s(&pud->pud_ngroups);
-        }
-
-        if (pud->pud_ngroups > LUSTRE_MAX_GROUPS) {
-                CERROR("%u groups is too large\n", pud->pud_ngroups);
-                return -EINVAL;
-        }
-
-        if (sizeof(*pud) + pud->pud_ngroups * sizeof(__u32) >
-            msg->lm_buflens[offset]) {
-                CERROR("%u groups are claimed but bufsize only %u\n",
-                       pud->pud_ngroups, msg->lm_buflens[offset]);
-                return -EINVAL;
-        }
-
-        if (swabbed) {
-                for (i = 0; i < pud->pud_ngroups; i++)
-                        __swab32s(&pud->pud_groups[i]);
-        }
-
-        return 0;
+       struct ptlrpc_user_desc *pud;
+       int i;
+
+       pud = lustre_msg_buf(msg, offset, sizeof(*pud));
+       if (!pud)
+               return -EINVAL;
+
+       if (swabbed) {
+               __swab32s(&pud->pud_uid);
+               __swab32s(&pud->pud_gid);
+               __swab32s(&pud->pud_fsuid);
+               __swab32s(&pud->pud_fsgid);
+               __swab32s(&pud->pud_cap);
+               __swab32s(&pud->pud_ngroups);
+       }
+
+       if (pud->pud_ngroups > LUSTRE_MAX_GROUPS) {
+               CERROR("%u groups is too large\n", pud->pud_ngroups);
+               return -EINVAL;
+       }
+
+       if (sizeof(*pud) + pud->pud_ngroups * sizeof(__u32) >
+           msg->lm_buflens[offset]) {
+               CERROR("%u groups are claimed but bufsize only %u\n",
+                      pud->pud_ngroups, msg->lm_buflens[offset]);
+               return -EINVAL;
+       }
+
+       if (swabbed) {
+               for (i = 0; i < pud->pud_ngroups; i++)
+                       __swab32s(&pud->pud_groups[i]);
+       }
+
+       return 0;
 }
 EXPORT_SYMBOL(sptlrpc_unpack_user_desc);
 
-/****************************************
- * misc helpers                         *
- ****************************************/
+/*
+ * misc helpers
+ */
 
-const char * sec2target_str(struct ptlrpc_sec *sec)
+const char *sec2target_str(struct ptlrpc_sec *sec)
 {
-        if (!sec || !sec->ps_import || !sec->ps_import->imp_obd)
-                return "*";
-        if (sec_is_reverse(sec))
-                return "c";
-        return obd_uuid2str(&sec->ps_import->imp_obd->u.cli.cl_target_uuid);
+       if (!sec || !sec->ps_import || !sec->ps_import->imp_obd)
+               return "*";
+       if (sec_is_reverse(sec))
+               return "c";
+       return obd_uuid2str(&sec->ps_import->imp_obd->u.cli.cl_target_uuid);
 }
 EXPORT_SYMBOL(sec2target_str);
 
@@ -2511,76 +2674,76 @@ EXPORT_SYMBOL(sec2target_str);
  */
 int sptlrpc_flavor_has_bulk(struct sptlrpc_flavor *flvr)
 {
-        switch (SPTLRPC_FLVR_BULK_SVC(flvr->sf_rpc)) {
-        case SPTLRPC_BULK_SVC_INTG:
-        case SPTLRPC_BULK_SVC_PRIV:
-                return 1;
-        default:
-                return 0;
-        }
+       switch (SPTLRPC_FLVR_BULK_SVC(flvr->sf_rpc)) {
+       case SPTLRPC_BULK_SVC_INTG:
+       case SPTLRPC_BULK_SVC_PRIV:
+               return 1;
+       default:
+               return 0;
+       }
 }
 EXPORT_SYMBOL(sptlrpc_flavor_has_bulk);
 
-/****************************************
- * crypto API helper/alloc blkciper     *
- ****************************************/
+/*
+ * crypto API helper/alloc blkciper
+ */
 
-/****************************************
- * initialize/finalize                  *
- ****************************************/
+/*
+ * initialize/finalize
+ */
 
 int sptlrpc_init(void)
 {
-        int rc;
+       int rc;
 
        rwlock_init(&policy_lock);
 
-        rc = sptlrpc_gc_init();
-        if (rc)
-                goto out;
+       rc = sptlrpc_gc_init();
+       if (rc)
+               goto out;
 
-        rc = sptlrpc_conf_init();
-        if (rc)
-                goto out_gc;
+       rc = sptlrpc_conf_init();
+       if (rc)
+               goto out_gc;
 
-        rc = sptlrpc_enc_pool_init();
-        if (rc)
-                goto out_conf;
+       rc = sptlrpc_enc_pool_init();
+       if (rc)
+               goto out_conf;
 
-        rc = sptlrpc_null_init();
-        if (rc)
-                goto out_pool;
+       rc = sptlrpc_null_init();
+       if (rc)
+               goto out_pool;
 
-        rc = sptlrpc_plain_init();
-        if (rc)
-                goto out_null;
+       rc = sptlrpc_plain_init();
+       if (rc)
+               goto out_null;
 
-        rc = sptlrpc_lproc_init();
-        if (rc)
-                goto out_plain;
+       rc = sptlrpc_lproc_init();
+       if (rc)
+               goto out_plain;
 
-        return 0;
+       return 0;
 
 out_plain:
-        sptlrpc_plain_fini();
+       sptlrpc_plain_fini();
 out_null:
-        sptlrpc_null_fini();
+       sptlrpc_null_fini();
 out_pool:
-        sptlrpc_enc_pool_fini();
+       sptlrpc_enc_pool_fini();
 out_conf:
-        sptlrpc_conf_fini();
+       sptlrpc_conf_fini();
 out_gc:
-        sptlrpc_gc_fini();
+       sptlrpc_gc_fini();
 out:
-        return rc;
+       return rc;
 }
 
 void sptlrpc_fini(void)
 {
-        sptlrpc_lproc_fini();
-        sptlrpc_plain_fini();
-        sptlrpc_null_fini();
-        sptlrpc_enc_pool_fini();
-        sptlrpc_conf_fini();
-        sptlrpc_gc_fini();
+       sptlrpc_lproc_fini();
+       sptlrpc_plain_fini();
+       sptlrpc_null_fini();
+       sptlrpc_enc_pool_fini();
+       sptlrpc_conf_fini();
+       sptlrpc_gc_fini();
 }