X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lnet%2Fklnds%2Fgnilnd%2Fgnilnd_cb.c;h=93cae3d8db4b7663735c1d65914cabf1a14a676d;hb=135b5c0009e5201ac70394ee1fe98e523fe86072;hp=443d7fead2aaf3b4e9ced8fc15af291c016e5e90;hpb=4cd98c50df3f006ec71afb076113c0046c89a3d8;p=fs%2Flustre-release.git

diff --git a/lnet/klnds/gnilnd/gnilnd_cb.c b/lnet/klnds/gnilnd/gnilnd_cb.c
index 443d7fe..93cae3d 100644
--- a/lnet/klnds/gnilnd/gnilnd_cb.c
+++ b/lnet/klnds/gnilnd/gnilnd_cb.c
@@ -26,6 +26,7 @@
 
 #include <asm/page.h>
 #include <linux/nmi.h>
+#include <linux/pagemap.h>
 #include "gnilnd.h"
 
 /* this is useful when needed to debug wire corruption. */
@@ -81,7 +82,6 @@ kgnilnd_schedule_device(kgn_device_t *dev)
 	if (!already_live) {
 		wake_up_all(&dev->gnd_waitq);
 	}
-	return;
 }
 
 void kgnilnd_schedule_device_timer(unsigned long arg)
@@ -1150,8 +1150,10 @@ kgnilnd_unmap_buffer(kgn_tx_t *tx, int error)
 	int               hold_timeout = 0;
 
 	/* code below relies on +1 relationship ... */
-	CLASSERT(GNILND_BUF_PHYS_MAPPED == (GNILND_BUF_PHYS_UNMAPPED + 1));
-	CLASSERT(GNILND_BUF_VIRT_MAPPED == (GNILND_BUF_VIRT_UNMAPPED + 1));
+	BUILD_BUG_ON(GNILND_BUF_PHYS_MAPPED !=
+		     (GNILND_BUF_PHYS_UNMAPPED + 1));
+	BUILD_BUG_ON(GNILND_BUF_VIRT_MAPPED !=
+		     (GNILND_BUF_VIRT_UNMAPPED + 1));
 
 	switch (tx->tx_buftype) {
 	default:
@@ -1913,11 +1915,11 @@ kgnilnd_rdma(kgn_tx_t *tx, int type,
 
 			tx->tx_offset = ((__u64)((unsigned long)sink->gnrd_addr)) & 3;
 			if (tx->tx_offset)
-				kgnilnd_admin_addref(kgnilnd_data.kgn_rev_offset);
+				atomic_inc(&kgnilnd_data.kgn_rev_offset);
 
 			if ((nob + tx->tx_offset) & 3) {
 				desc_nob = ((nob + tx->tx_offset) + (4 - ((nob + tx->tx_offset) & 3)));
-				kgnilnd_admin_addref(kgnilnd_data.kgn_rev_length);
+				atomic_inc(&kgnilnd_data.kgn_rev_length);
 			} else {
 				desc_nob = (nob + tx->tx_offset);
 			}
@@ -1933,7 +1935,7 @@ kgnilnd_rdma(kgn_tx_t *tx, int type,
 					kgnilnd_tx_done(tx, -EFAULT);
 					return 0;
 				}
-				kgnilnd_admin_addref(kgnilnd_data.kgn_rev_copy_buff);
+				atomic_inc(&kgnilnd_data.kgn_rev_copy_buff);
 				rc = kgnilnd_mem_register(conn->gnc_device->gnd_handle, (__u64)tx->tx_buffer_copy, desc_nob, NULL, GNI_MEM_READWRITE, &tx->tx_buffer_copy_map_key);
 				if (rc != GNI_RC_SUCCESS) {
 					/* Registration Failed nak rdma and kill the tx. */
@@ -2070,8 +2072,6 @@ kgnilnd_release_msg(kgn_conn_t *conn)
 	GNIDBG_SMSG_CREDS(D_NET, conn);
 
 	kgnilnd_schedule_conn(conn);
-
-	return;
 }
 
 void
@@ -2095,8 +2095,6 @@ kgnilnd_consume_rx(kgn_rx_t *rx)
 	kmem_cache_free(kgnilnd_data.kgn_rx_cache, rx);
 	CDEBUG(D_MALLOC, "slab-freed 'rx': %lu at %p.\n",
 	       sizeof(*rx), rx);
-
-	return;
 }
 
 int
@@ -2886,8 +2884,9 @@ kgnilnd_check_peer_timeouts_locked(kgn_peer_t *peer, struct list_head *todie,
 
 		CDEBUG(D_NET, "starting connect to %s\n",
 			libcfs_nid2str(peer->gnp_nid));
-		LASSERTF(peer->gnp_connecting == GNILND_PEER_IDLE, "Peer was idle and we"
-			"have a write_lock, state issue %d\n", peer->gnp_connecting);
+		LASSERTF(peer->gnp_connecting == GNILND_PEER_IDLE,
+			 "Peer was idle and we have a write_lock, state issue %d\n",
+			 peer->gnp_connecting);
 
 		peer->gnp_connecting = GNILND_PEER_CONNECT;
 		kgnilnd_peer_addref(peer); /* extra ref for connd */
@@ -2977,8 +2976,6 @@ kgnilnd_check_peer_timeouts_locked(kgn_peer_t *peer, struct list_head *todie,
 			}
 		}
 	}
-
-	return;
 }
 
 void
@@ -2986,11 +2983,8 @@ kgnilnd_reaper_check(int idx)
 {
 	struct list_head  *peers = &kgnilnd_data.kgn_peers[idx];
 	struct list_head  *ctmp, *ctmpN;
-	struct list_head   geriatrics;
-	struct list_head   souls;
-
-	INIT_LIST_HEAD(&geriatrics);
-	INIT_LIST_HEAD(&souls);
+	LIST_HEAD(geriatrics);
+	LIST_HEAD(souls);
 
 	write_lock(&kgnilnd_data.kgn_peer_conn_lock);
 
@@ -3537,8 +3531,7 @@ kgnilnd_check_fma_rcv_cq(kgn_device_t *dev)
 				/* set overrun too */
 				event_data |= (1UL << 63);
 				LASSERTF(GNI_CQ_OVERRUN(event_data),
-					 "(1UL << 63) is no longer the bit to"
-					 "set to indicate CQ_OVERRUN\n");
+					 "(1UL << 63) is no longer the bit to set to indicate CQ_OVERRUN\n");
 			}
 		}
 		/* sender should get error event too and take care