X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fptlrpc%2Fgss%2Fgss_svc_upcall.c;h=3e607674bf2c05f0d98114ed93fd59b91c9f916c;hb=b2bb3b247d1dc75e25f1b5c14a333905909b5e70;hp=7fcc3e83079ae16a94115f82102ce2cc2ea6ad33;hpb=6b308bb995383e9fa1e2ef73e27c60518e6639bd;p=fs%2Flustre-release.git

diff --git a/lustre/ptlrpc/gss/gss_svc_upcall.c b/lustre/ptlrpc/gss/gss_svc_upcall.c
index 7fcc3e8..3e60767 100644
--- a/lustre/ptlrpc/gss/gss_svc_upcall.c
+++ b/lustre/ptlrpc/gss/gss_svc_upcall.c
@@ -90,28 +90,50 @@ __u64 gss_get_next_ctx_index(void)
 
 static inline unsigned long hash_mem(char *buf, int length, int bits)
 {
-        unsigned long hash = 0;
-        unsigned long l = 0;
-        int len = 0;
-        unsigned char c;
-
-        do {
-                if (len == length) {
-                        c = (char) len;
-                        len = -1;
-                } else
-                        c = *buf++;
-
-                l = (l << 8) | c;
-                len++;
-
-                if ((len & (BITS_PER_LONG/8-1)) == 0)
-                        hash = cfs_hash_long(hash^l, BITS_PER_LONG);
-        } while (len);
-
-        return hash >> (BITS_PER_LONG - bits);
+	unsigned long hash = 0;
+	unsigned long l = 0;
+	int len = 0;
+	unsigned char c;
+
+	do {
+		if (len == length) {
+			c = (char) len;
+			len = -1;
+		} else
+			c = *buf++;
+
+		l = (l << 8) | c;
+		len++;
+
+		if ((len & (BITS_PER_LONG/8-1)) == 0)
+			hash = hash_long(hash^l, BITS_PER_LONG);
+	} while (len);
+
+	return hash >> (BITS_PER_LONG - bits);
 }
 
+/* This compatibility can be removed once kernel 3.3 is used,
+ * since cache_register_net/cache_unregister_net are exported.
+ * Note that since kernel 3.4 cache_register and cache_unregister
+ * are removed.
+*/
+static inline int _cache_register_net(struct cache_detail *cd, struct net *net)
+{
+#ifdef HAVE_CACHE_REGISTER
+	return cache_register(cd);
+#else
+	return cache_register_net(cd, net);
+#endif
+}
+static inline void _cache_unregister_net(struct cache_detail *cd,
+					 struct net *net)
+{
+#ifdef HAVE_CACHE_REGISTER
+	cache_unregister(cd);
+#else
+	cache_unregister_net(cd, net);
+#endif
+}
 /****************************************
  * rsi cache                            *
  ****************************************/
@@ -161,26 +183,34 @@ static void rsi_request(struct cache_detail *cd,
                         struct cache_head *h,
                         char **bpp, int *blen)
 {
-        struct rsi *rsi = container_of(h, struct rsi, h);
-        __u64 index = 0;
-
-        /* if in_handle is null, provide kernel suggestion */
-        if (rsi->in_handle.len == 0)
-                index = gss_get_next_ctx_index();
-
-        qword_addhex(bpp, blen, (char *) &rsi->lustre_svc,
-                     sizeof(rsi->lustre_svc));
-        qword_addhex(bpp, blen, (char *) &rsi->nid, sizeof(rsi->nid));
-        qword_addhex(bpp, blen, (char *) &index, sizeof(index));
-        qword_addhex(bpp, blen, rsi->in_handle.data, rsi->in_handle.len);
-        qword_addhex(bpp, blen, rsi->in_token.data, rsi->in_token.len);
-        (*bpp)[-1] = '\n';
+	struct rsi *rsi = container_of(h, struct rsi, h);
+	__u64 index = 0;
+
+	/* if in_handle is null, provide kernel suggestion */
+	if (rsi->in_handle.len == 0)
+		index = gss_get_next_ctx_index();
+
+	qword_addhex(bpp, blen, (char *) &rsi->lustre_svc,
+			sizeof(rsi->lustre_svc));
+	qword_addhex(bpp, blen, (char *) &rsi->nid, sizeof(rsi->nid));
+	qword_addhex(bpp, blen, (char *) &index, sizeof(index));
+	qword_addhex(bpp, blen, rsi->in_handle.data, rsi->in_handle.len);
+	qword_addhex(bpp, blen, rsi->in_token.data, rsi->in_token.len);
+	(*bpp)[-1] = '\n';
 }
 
+#ifdef HAVE_SUNRPC_UPCALL_HAS_3ARGS
 static int rsi_upcall(struct cache_detail *cd, struct cache_head *h)
 {
-        return sunrpc_cache_pipe_upcall(cd, h, rsi_request);
+	return sunrpc_cache_pipe_upcall(cd, h, rsi_request);
 }
+#else
+
+static int rsi_upcall(struct cache_detail *cd, struct cache_head *h)
+{
+	return sunrpc_cache_pipe_upcall(cd, h);
+}
+#endif
 
 static inline void __rsi_init(struct rsi *new, struct rsi *item)
 {
@@ -349,16 +379,19 @@ out:
 }
 
 static struct cache_detail rsi_cache = {
-        .hash_size      = RSI_HASHMAX,
-        .hash_table     = rsi_table,
-        .name           = "auth.sptlrpc.init",
-        .cache_put      = rsi_put,
-        .cache_upcall   = rsi_upcall,
-        .cache_parse    = rsi_parse,
-        .match          = rsi_match,
-        .init           = rsi_init,
-        .update         = update_rsi,
-        .alloc          = rsi_alloc,
+	.hash_size	= RSI_HASHMAX,
+	.hash_table	= rsi_table,
+	.name		= "auth.sptlrpc.init",
+	.cache_put	= rsi_put,
+#ifndef HAVE_SUNRPC_UPCALL_HAS_3ARGS
+	.cache_request	= rsi_request,
+#endif
+	.cache_upcall	= rsi_upcall,
+	.cache_parse	= rsi_parse,
+	.match		= rsi_match,
+	.init		= rsi_init,
+	.update		= update_rsi,
+	.alloc		= rsi_alloc,
 };
 
 static struct rsi *rsi_lookup(struct rsi *item)
@@ -1070,13 +1103,13 @@ int __init gss_init_svc_upcall(void)
 	 */
 	cfs_get_random_bytes(&__ctx_index, sizeof(__ctx_index));
 
-	rc = cache_register_net(&rsi_cache, &init_net);
+	rc = _cache_register_net(&rsi_cache, &init_net);
 	if (rc != 0)
 		return rc;
 
-	rc = cache_register_net(&rsc_cache, &init_net);
+	rc = _cache_register_net(&rsc_cache, &init_net);
 	if (rc != 0) {
-		cache_unregister_net(&rsi_cache, &init_net);
+		_cache_unregister_net(&rsi_cache, &init_net);
 		return rc;
 	}
 
@@ -1100,11 +1133,11 @@ int __init gss_init_svc_upcall(void)
 	return 0;
 }
 
-void __exit gss_exit_svc_upcall(void)
+void gss_exit_svc_upcall(void)
 {
 	cache_purge(&rsi_cache);
-	cache_unregister_net(&rsi_cache, &init_net);
+	_cache_unregister_net(&rsi_cache, &init_net);
 
 	cache_purge(&rsc_cache);
-	cache_unregister_net(&rsc_cache, &init_net);
+	_cache_unregister_net(&rsc_cache, &init_net);
 }