Branch b1_4

Further cray portals compile fix.

diff --git a/lustre/ost/ost_handler.c b/lustre/ost/ost_handler.c
index 185b202..8615d7c 100644 (file)
--- a/lustre/ost/ost_handler.c
+++ b/lustre/ost/ost_handler.c
@@ -352,16 +352,16 @@ static __u32 ost_checksum_bulk(struct ptlrpc_bulk_desc *desc)
                 int len = desc->bd_iov[i].iov_len;
 #else
                 struct page *page = desc->bd_iov[i].kiov_page;
-                char *ptr = kmap(page) + (desc->bd_iov[i].kiov_offset &
-                                          ~PAGE_MASK);
+                int off = desc->bd_iov[i].kiov_offset & ~PAGE_MASK;
+                char *ptr = kmap(page) + off;
                 int len = desc->bd_iov[i].kiov_len;
 #endif
 
                 cksum = crc32_le(cksum, ptr, len);
 #ifndef CRAY_PORTALS
                 kunmap(page);
+                LL_CDEBUG_PAGE(D_PAGE, page, "off %d checksum %x\n", off,cksum);
 #endif
-                LL_CDEBUG_PAGE(D_PAGE, page, "idx %d checksum %x\n", i, cksum);
         }
 
         return cksum;