X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lnet%2Fklnds%2Fgnilnd%2Fgnilnd_cb.c;fp=lnet%2Fklnds%2Fgnilnd%2Fgnilnd_cb.c;h=edd60cecc970b1da69a91bc253ac6c89fd69f02c;hb=3117913e21adb941e0ef3467ff7588d5e5fbc6e4;hp=5f838b1e980390913627d54bd6cc5b3f288cb2a1;hpb=e00733f0f87659c936039a58ea738cfb070638bc;p=fs%2Flustre-release.git

diff --git a/lnet/klnds/gnilnd/gnilnd_cb.c b/lnet/klnds/gnilnd/gnilnd_cb.c
index 5f838b1..edd60ce 100644
--- a/lnet/klnds/gnilnd/gnilnd_cb.c
+++ b/lnet/klnds/gnilnd/gnilnd_cb.c
@@ -535,10 +535,9 @@ kgnilnd_setup_immediate_buffer(kgn_tx_t *tx, unsigned int niov,
 		tx->tx_buffer = NULL;
 	} else {
 
-		if ((niov > 0) && unlikely(niov > (nob/PAGE_SIZE))) {
-			niov = round_up(nob + offset + kiov->bv_offset,
-					PAGE_SIZE);
-		}
+		if (niov && niov > (nob >> PAGE_SHIFT))
+			niov = DIV_ROUND_UP(nob + offset + kiov->bv_offset,
+					    PAGE_SIZE);
 
 		LASSERTF(niov > 0 && niov < GNILND_MAX_IMMEDIATE/PAGE_SIZE,
 			"bad niov %d msg %p kiov %p offset %d nob%d\n",