X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lnet%2Fklnds%2Fgnilnd%2Fgnilnd_cb.c;h=d9839cef372b48ee182a58449296885ec2340566;hb=2c800c7ad0102407ea89af4d2a98ba761b957d4a;hp=ab86f2cf9bd759cf3d04ff9a6f673305468d93c5;hpb=88f761bc00c7fb29db4f80594ae864493bdd5071;p=fs%2Flustre-release.git

diff --git a/lnet/klnds/gnilnd/gnilnd_cb.c b/lnet/klnds/gnilnd/gnilnd_cb.c
index ab86f2c..d9839ce 100644
--- a/lnet/klnds/gnilnd/gnilnd_cb.c
+++ b/lnet/klnds/gnilnd/gnilnd_cb.c
@@ -507,7 +507,8 @@ kgnilnd_setup_immediate_buffer(kgn_tx_t *tx, unsigned int niov,
 	} else if (kiov != NULL) {
 
 		if ((niov > 0) && unlikely(niov > (nob/PAGE_SIZE))) {
-			niov = ((nob + offset + PAGE_SIZE - 1) / PAGE_SIZE);
+			niov = ((nob + offset + kiov->kiov_offset + PAGE_SIZE - 1) /
+				PAGE_SIZE);
 		}
 
 		LASSERTF(niov > 0 && niov < GNILND_MAX_IMMEDIATE/PAGE_SIZE,
@@ -3072,7 +3073,7 @@ kgnilnd_reaper(void *arg)
 				    next_check_time);
 			mod_timer(&timer, (long) jiffies + timeout);
 
-			/* check flag variables before comitting */
+			/* check flag variables before committing */
 			if (!kgnilnd_data.kgn_shutdown &&
 			    !kgnilnd_data.kgn_quiesce_trigger) {
 				CDEBUG(D_INFO, "schedule timeout %ld (%lu sec)\n",