b=15908

[fs/lustre-release.git] / lustre / ptlrpc / sec_null.c

diff --git a/lustre/ptlrpc/sec_null.c b/lustre/ptlrpc/sec_null.c
index dddf7e2..59e2400 100644 (file)
--- a/lustre/ptlrpc/sec_null.c
+++ b/lustre/ptlrpc/sec_null.c
@@ -73,14 +73,12 @@ int null_ctx_refresh(struct ptlrpc_cli_ctx *ctx)
 static
 int null_ctx_sign(struct ptlrpc_cli_ctx *ctx, struct ptlrpc_request *req)
 {
-        if (req->rq_reqbuf->lm_magic != LUSTRE_MSG_MAGIC_V1) {
-                req->rq_reqbuf->lm_secflvr = SPTLRPC_FLVR_NULL;
-
-                if (!req->rq_import->imp_dlm_fake) {
-                        struct obd_device *obd = req->rq_import->imp_obd;
-                        null_encode_sec_part(req->rq_reqbuf,
-                                             obd->u.cli.cl_sec_part);
-                }
+        req->rq_reqbuf->lm_secflvr = SPTLRPC_FLVR_NULL;
+
+        if (!req->rq_import->imp_dlm_fake) {
+                struct obd_device *obd = req->rq_import->imp_obd;
+                null_encode_sec_part(req->rq_reqbuf,
+                                     obd->u.cli.cl_sec_part);
         }
         req->rq_reqdata_len = req->rq_reqlen;
         return 0;
@@ -112,10 +110,10 @@ struct ptlrpc_sec *null_create_sec(struct obd_import *imp,
 {
         LASSERT(RPC_FLVR_POLICY(sf->sf_rpc) == SPTLRPC_POLICY_NULL);
 
-        if (sf->sf_bulk_priv != BULK_PRIV_ALG_NULL ||
-            sf->sf_bulk_csum != BULK_CSUM_ALG_NULL) {
+        if (sf->sf_bulk_ciph != BULK_CIPH_ALG_NULL ||
+            sf->sf_bulk_hash != BULK_HASH_ALG_NULL) {
                 CERROR("null sec don't support bulk algorithm: %u/%u\n",
-                       sf->sf_bulk_priv, sf->sf_bulk_csum);
+                       sf->sf_bulk_ciph, sf->sf_bulk_hash);
                 return NULL;
         }
 
@@ -331,8 +329,7 @@ int null_authorize(struct ptlrpc_request *req)
         struct ptlrpc_reply_state *rs = req->rq_reply_state;
 
         LASSERT(rs);
-        if (rs->rs_repbuf->lm_magic != LUSTRE_MSG_MAGIC_V1)
-                rs->rs_repbuf->lm_secflvr = SPTLRPC_FLVR_NULL;
+        rs->rs_repbuf->lm_secflvr = SPTLRPC_FLVR_NULL;
         rs->rs_repdata_len = req->rq_replen;
         return 0;
 }
@@ -374,14 +371,14 @@ void null_init_internal(void)
         null_sec.ps_id = -1;
         null_sec.ps_import = NULL;
         null_sec.ps_flvr.sf_rpc = SPTLRPC_FLVR_NULL;
-        null_sec.ps_flvr.sf_bulk_priv = BULK_PRIV_ALG_NULL;
-        null_sec.ps_flvr.sf_bulk_csum = BULK_CSUM_ALG_NULL;
+        null_sec.ps_flvr.sf_bulk_ciph = BULK_CIPH_ALG_NULL;
+        null_sec.ps_flvr.sf_bulk_hash = BULK_HASH_ALG_NULL;
         null_sec.ps_flvr.sf_flags = 0;
         null_sec.ps_part = LUSTRE_SP_ANY;
         null_sec.ps_dying = 0;
         spin_lock_init(&null_sec.ps_lock);
         atomic_set(&null_sec.ps_nctx, 1);         /* for "null_cli_ctx" */
-        INIT_LIST_HEAD(&null_sec.ps_gc_list);
+        CFS_INIT_LIST_HEAD(&null_sec.ps_gc_list);
         null_sec.ps_gc_interval = 0;
         null_sec.ps_gc_next = 0;
 
@@ -394,8 +391,8 @@ void null_init_internal(void)
                                 PTLRPC_CTX_UPTODATE;
         null_cli_ctx.cc_vcred.vc_uid = 0;
         spin_lock_init(&null_cli_ctx.cc_lock);
-        INIT_LIST_HEAD(&null_cli_ctx.cc_req_list);
-        INIT_LIST_HEAD(&null_cli_ctx.cc_gc_chain);
+        CFS_INIT_LIST_HEAD(&null_cli_ctx.cc_req_list);
+        CFS_INIT_LIST_HEAD(&null_cli_ctx.cc_gc_chain);
 }
 
 int sptlrpc_null_init(void)