X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lnet%2Fselftest%2Fframework.c;h=5c451c8a6aca4013b664def6db77e932bf40419d;hb=72057a3af19ee02d9a686bd7e7d074917e381310;hp=24f2e39defa115e82126f98c5fc45a71bea084b7;hpb=d96a9248708d4da02728c9976a9a90ba29bd2bc0;p=fs%2Flustre-release.git

diff --git a/lnet/selftest/framework.c b/lnet/selftest/framework.c
index 24f2e39..5c451c8 100644
--- a/lnet/selftest/framework.c
+++ b/lnet/selftest/framework.c
@@ -15,11 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
@@ -257,7 +253,7 @@ sfw_session_expired (void *data)
         LASSERT (sn->sn_timer_active);
         LASSERT (sn == sfw_data.fw_session);
 
-        CWARN ("Session expired! sid: %s-"LPU64", name: %s\n",
+	CWARN ("Session expired! sid: %s-%llu, name: %s\n",
                libcfs_nid2str(sn->sn_id.ses_nid),
                sn->sn_id.ses_stamp, &sn->sn_name[0]);
 
@@ -757,7 +753,7 @@ sfw_add_test_instance (sfw_batch_t *tsb, srpc_server_rpc_t *rpc)
 
         LIBCFS_ALLOC(tsi, sizeof(*tsi));
         if (tsi == NULL) {
-                CERROR ("Can't allocate test instance for batch: "LPU64"\n",
+		CERROR ("Can't allocate test instance for batch: %llu\n",
                         tsb->bat_id.bat_id);
                 return -ENOMEM;
         }
@@ -1017,7 +1013,7 @@ sfw_run_batch (sfw_batch_t *tsb)
         sfw_test_instance_t *tsi;
 
         if (sfw_batch_active(tsb)) {
-                CDEBUG(D_NET, "Batch already active: "LPU64" (%d)\n",
+		CDEBUG(D_NET, "Batch already active: %llu (%d)\n",
 		       tsb->bat_id.bat_id, atomic_read(&tsb->bat_nactive));
                 return 0;
         }
@@ -1052,7 +1048,7 @@ sfw_stop_batch (sfw_batch_t *tsb, int force)
         srpc_client_rpc_t   *rpc;
 
         if (!sfw_batch_active(tsb)) {
-                CDEBUG(D_NET, "Batch "LPU64" inactive\n", tsb->bat_id.bat_id);
+		CDEBUG(D_NET, "Batch %llu inactive\n", tsb->bat_id.bat_id);
                 return 0;
         }
 
@@ -1125,7 +1121,7 @@ sfw_alloc_pages(struct srpc_server_rpc *rpc, int cpt, int npages, int len,
 	LASSERT(rpc->srpc_bulk == NULL);
 	LASSERT(npages > 0 && npages <= LNET_MAX_IOV);
 
-	rpc->srpc_bulk = srpc_alloc_bulk(cpt, npages, len, sink);
+	rpc->srpc_bulk = srpc_alloc_bulk(cpt, 0, npages, len, sink);
 	if (rpc->srpc_bulk == NULL)
 		return -ENOMEM;
 
@@ -1181,7 +1177,7 @@ sfw_add_test (srpc_server_rpc_t *rpc)
 		int	len;
 
 		if ((sn->sn_features & LST_FEAT_BULK_LEN) == 0) {
-			len = npg * PAGE_CACHE_SIZE;
+			len = npg * PAGE_SIZE;
 
 		} else  {
 			len = sizeof(lnet_process_id_packed_t) *