X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fptlrpc%2Fsec_null.c;h=5b51c188ff1ddfe4af1bd40a0c669e85f0bc9395;hp=1cb79e338b6fe6dafcac3d63734516a2863a8a1f;hb=9fb46705ae86aa2c0ac29427f0ff24f923560eb7;hpb=e2af7fb3c91dfb13d34d8e1b2f2df8c09621f768

diff --git a/lustre/ptlrpc/sec_null.c b/lustre/ptlrpc/sec_null.c
index 1cb79e3..5b51c18 100644
--- a/lustre/ptlrpc/sec_null.c
+++ b/lustre/ptlrpc/sec_null.c
@@ -104,7 +104,7 @@ int null_ctx_verify(struct ptlrpc_cli_ctx *ctx, struct ptlrpc_request *req)
 
         if (req->rq_early) {
                 cksums = lustre_msg_get_cksum(req->rq_repdata);
-#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 0, 0)
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 7, 50, 0)
                 if (lustre_msghdr_get_flags(req->rq_reqmsg) &
                     MSGHDR_CKSUM_INCOMPAT18)
                         cksumc = lustre_msg_calc_cksum(req->rq_repmsg, 0);
@@ -363,7 +363,7 @@ int null_authorize(struct ptlrpc_request *req)
         } else {
                 __u32 cksum;
 
-#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 0, 0)
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 7, 50, 0)
                 if (lustre_msghdr_get_flags(req->rq_reqmsg) &
                     MSGHDR_CKSUM_INCOMPAT18)
                         cksum = lustre_msg_calc_cksum(rs->rs_repbuf, 0);
@@ -425,7 +425,7 @@ static void null_init_internal(void)
         null_sec.ps_flvr.sf_flags = 0;
         null_sec.ps_part = LUSTRE_SP_ANY;
         null_sec.ps_dying = 0;
-        cfs_spin_lock_init(&null_sec.ps_lock);
+	spin_lock_init(&null_sec.ps_lock);
         cfs_atomic_set(&null_sec.ps_nctx, 1);         /* for "null_cli_ctx" */
         CFS_INIT_LIST_HEAD(&null_sec.ps_gc_list);
         null_sec.ps_gc_interval = 0;
@@ -439,9 +439,9 @@ static void null_init_internal(void)
         null_cli_ctx.cc_flags = PTLRPC_CTX_CACHED | PTLRPC_CTX_ETERNAL |
                                 PTLRPC_CTX_UPTODATE;
         null_cli_ctx.cc_vcred.vc_uid = 0;
-        cfs_spin_lock_init(&null_cli_ctx.cc_lock);
-        CFS_INIT_LIST_HEAD(&null_cli_ctx.cc_req_list);
-        CFS_INIT_LIST_HEAD(&null_cli_ctx.cc_gc_chain);
+	spin_lock_init(&null_cli_ctx.cc_lock);
+	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)