X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fptlrpc%2Fgss%2Fsec_gss.c;h=f69e2d5c31e45087676dd4db18b64fd6c99e30a0;hb=refs%2Fchanges%2F74%2F13174%2F2;hp=5c04d1c9047e4603722047046d4871d9745b04a3;hpb=0398926e4683ab3b743691b98bbf18e66383eeba;p=fs%2Flustre-release.git

diff --git a/lustre/ptlrpc/gss/sec_gss.c b/lustre/ptlrpc/gss/sec_gss.c
index 5c04d1c..f69e2d5 100644
--- a/lustre/ptlrpc/gss/sec_gss.c
+++ b/lustre/ptlrpc/gss/sec_gss.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  *
- * Copyright (c) 2011, 2013, Intel Corporation.
+ * Copyright (c) 2011, 2014, Intel Corporation.
  *
  * Author: Eric Mei <ericm@clusterfs.com>
  */
@@ -47,7 +47,6 @@
  */
 
 #define DEBUG_SUBSYSTEM S_SEC
-#ifdef __KERNEL__
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/slab.h>
@@ -55,9 +54,6 @@
 #include <linux/fs.h>
 #include <linux/mutex.h>
 #include <asm/atomic.h>
-#else
-#include <liblustre.h>
-#endif
 
 #include <obd.h>
 #include <obd_class.h>
@@ -624,24 +620,22 @@ int gss_cli_ctx_match(struct ptlrpc_cli_ctx *ctx, struct vfs_cred *vcred)
 
 void gss_cli_ctx_flags2str(unsigned long flags, char *buf, int bufsize)
 {
-        buf[0] = '\0';
-
-        if (flags & PTLRPC_CTX_NEW)
-                strncat(buf, "new,", bufsize);
-        if (flags & PTLRPC_CTX_UPTODATE)
-                strncat(buf, "uptodate,", bufsize);
-        if (flags & PTLRPC_CTX_DEAD)
-                strncat(buf, "dead,", bufsize);
-        if (flags & PTLRPC_CTX_ERROR)
-                strncat(buf, "error,", bufsize);
-        if (flags & PTLRPC_CTX_CACHED)
-                strncat(buf, "cached,", bufsize);
-        if (flags & PTLRPC_CTX_ETERNAL)
-                strncat(buf, "eternal,", bufsize);
-        if (buf[0] == '\0')
-                strncat(buf, "-,", bufsize);
+	buf[0] = '\0';
 
-        buf[strlen(buf) - 1] = '\0';
+	if (flags & PTLRPC_CTX_NEW)
+		strlcat(buf, "new,", bufsize);
+	if (flags & PTLRPC_CTX_UPTODATE)
+		strlcat(buf, "uptodate,", bufsize);
+	if (flags & PTLRPC_CTX_DEAD)
+		strlcat(buf, "dead,", bufsize);
+	if (flags & PTLRPC_CTX_ERROR)
+		strlcat(buf, "error,", bufsize);
+	if (flags & PTLRPC_CTX_CACHED)
+		strlcat(buf, "cached,", bufsize);
+	if (flags & PTLRPC_CTX_ETERNAL)
+		strlcat(buf, "eternal,", bufsize);
+	if (buf[0] == '\0')
+		strlcat(buf, "-,", bufsize);
 }
 
 int gss_cli_ctx_sign(struct ptlrpc_cli_ctx *ctx,
@@ -1130,7 +1124,7 @@ int gss_sec_create_common(struct gss_sec *gsec,
 	sec->ps_flvr = *sf;
 	sec->ps_import = class_import_get(imp);
 	spin_lock_init(&sec->ps_lock);
-	CFS_INIT_LIST_HEAD(&sec->ps_gc_list);
+	INIT_LIST_HEAD(&sec->ps_gc_list);
 
         if (!svcctx) {
                 sec->ps_gc_interval = GSS_GC_INTERVAL;
@@ -1186,7 +1180,7 @@ int gss_cli_ctx_init_common(struct ptlrpc_sec *sec,
 	gctx->gc_win = 0;
 	atomic_set(&gctx->gc_seq, 0);
 
-	CFS_INIT_HLIST_NODE(&ctx->cc_cache);
+	INIT_HLIST_NODE(&ctx->cc_cache);
 	atomic_set(&ctx->cc_refcount, 0);
 	ctx->cc_sec = sec;
 	ctx->cc_ops = ctxops;
@@ -1194,8 +1188,8 @@ int gss_cli_ctx_init_common(struct ptlrpc_sec *sec,
 	ctx->cc_flags = PTLRPC_CTX_NEW;
 	ctx->cc_vcred = *vcred;
 	spin_lock_init(&ctx->cc_lock);
-	CFS_INIT_LIST_HEAD(&ctx->cc_req_list);
-	CFS_INIT_LIST_HEAD(&ctx->cc_gc_chain);
+	INIT_LIST_HEAD(&ctx->cc_req_list);
+	INIT_LIST_HEAD(&ctx->cc_gc_chain);
 
 	/* take a ref on belonging sec, balanced in ctx destroying */
 	atomic_inc(&sec->ps_refcount);