X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=lustre%2Fptlrpc%2Fsec_null.c;h=d661ee3ced807b83e523acba5675c504a117883c;hb=c56f7675bfb17b3847b38044153e86550ced3c8e;hp=1d02bc5be89cf8543879b7d1feca0e1cf11a3390;hpb=b35de525a14843f07ca0dbe611e254c82b08e161;p=fs%2Flustre-release.git

diff --git a/lustre/ptlrpc/sec_null.c b/lustre/ptlrpc/sec_null.c
index 1d02bc5..d661ee3 100644
--- a/lustre/ptlrpc/sec_null.c
+++ b/lustre/ptlrpc/sec_null.c
@@ -27,7 +27,7 @@
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2012, Intel Corporation.
+ * Copyright (c) 2011, 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -40,9 +40,6 @@
 
 #define DEBUG_SUBSYSTEM S_SEC
 
-#ifndef __KERNEL__
-#include <liblustre.h>
-#endif
 
 #include <obd_support.h>
 #include <obd_cksum.h>
@@ -50,6 +47,8 @@
 #include <lustre_net.h>
 #include <lustre_sec.h>
 
+#include "ptlrpc_internal.h"
+
 static struct ptlrpc_sec_policy null_policy;
 static struct ptlrpc_sec        null_sec;
 static struct ptlrpc_cli_ctx    null_cli_ctx;
@@ -104,15 +103,14 @@ 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, 7, 50, 0)
-                if (lustre_msghdr_get_flags(req->rq_reqmsg) &
-                    MSGHDR_CKSUM_INCOMPAT18)
-                        cksumc = lustre_msg_calc_cksum(req->rq_repmsg, 0);
-                else
-                        cksumc = lustre_msg_calc_cksum(req->rq_repmsg, 1);
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 7, 53, 0)
+		if (lustre_msghdr_get_flags(req->rq_reqmsg) &
+		    MSGHDR_CKSUM_INCOMPAT18)
+			cksumc = lustre_msg_calc_cksum(req->rq_repmsg, 0);
+		else
+			cksumc = lustre_msg_calc_cksum(req->rq_repmsg, 1);
 #else
-# warning "remove checksum compatibility support for b1_8"
-                cksumc = lustre_msg_calc_cksum(req->rq_repmsg);
+		cksumc = lustre_msg_calc_cksum(req->rq_repmsg);
 #endif
                 if (cksumc != cksums) {
                         CDEBUG(D_SEC,
@@ -374,21 +372,20 @@ int null_authorize(struct ptlrpc_request *req)
         } else {
                 __u32 cksum;
 
-#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);
-                else
-                        cksum = lustre_msg_calc_cksum(rs->rs_repbuf, 1);
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 7, 53, 0)
+		if (lustre_msghdr_get_flags(req->rq_reqmsg) &
+		    MSGHDR_CKSUM_INCOMPAT18)
+			cksum = lustre_msg_calc_cksum(rs->rs_repbuf, 0);
+		else
+			cksum = lustre_msg_calc_cksum(rs->rs_repbuf, 1);
 #else
-# warning "remove checksum compatibility support for b1_8"
-                cksum = lustre_msg_calc_cksum(rs->rs_repbuf);
+		cksum = lustre_msg_calc_cksum(rs->rs_repbuf);
 #endif
-                lustre_msg_set_cksum(rs->rs_repbuf, cksum);
-                req->rq_reply_off = 0;
-        }
+		lustre_msg_set_cksum(rs->rs_repbuf, cksum);
+		req->rq_reply_off = 0;
+	}
 
-        return 0;
+	return 0;
 }
 
 static struct ptlrpc_ctx_ops null_ctx_ops = {
@@ -426,7 +423,7 @@ static struct ptlrpc_sec_policy null_policy = {
 
 static void null_init_internal(void)
 {
-	static CFS_HLIST_HEAD(__list);
+	static HLIST_HEAD(__list);
 
 	null_sec.ps_policy = &null_policy;
 	atomic_set(&null_sec.ps_refcount, 1);	/* always busy */
@@ -438,11 +435,11 @@ static void null_init_internal(void)
 	null_sec.ps_dying = 0;
 	spin_lock_init(&null_sec.ps_lock);
 	atomic_set(&null_sec.ps_nctx, 1);	/* for "null_cli_ctx" */
-	CFS_INIT_LIST_HEAD(&null_sec.ps_gc_list);
+	INIT_LIST_HEAD(&null_sec.ps_gc_list);
 	null_sec.ps_gc_interval = 0;
 	null_sec.ps_gc_next = 0;
 
-	cfs_hlist_add_head(&null_cli_ctx.cc_cache, &__list);
+	hlist_add_head(&null_cli_ctx.cc_cache, &__list);
 	atomic_set(&null_cli_ctx.cc_refcount, 1);	/* for hash */
 	null_cli_ctx.cc_sec = &null_sec;
 	null_cli_ctx.cc_ops = &null_ctx_ops;
@@ -451,8 +448,8 @@ static void null_init_internal(void)
 				PTLRPC_CTX_UPTODATE;
 	null_cli_ctx.cc_vcred.vc_uid = 0;
 	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);
+	INIT_LIST_HEAD(&null_cli_ctx.cc_req_list);
+	INIT_LIST_HEAD(&null_cli_ctx.cc_gc_chain);
 }
 
 int sptlrpc_null_init(void)