Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
land b1_4_bgl on HEAD (20050404_1913)
[fs/lustre-release.git]
/
lnet
/
klnds
/
viblnd
/
viblnd.c
diff --git
a/lnet/klnds/viblnd/viblnd.c
b/lnet/klnds/viblnd/viblnd.c
index
b89fc11
..
7995610
100644
(file)
--- a/
lnet/klnds/viblnd/viblnd.c
+++ b/
lnet/klnds/viblnd/viblnd.c
@@
-56,7
+56,7
@@
void vibnal_assert_wire_constants (void)
/* Constants... */
CLASSERT (IBNAL_MSG_MAGIC == 0x0be91b91);
/* Constants... */
CLASSERT (IBNAL_MSG_MAGIC == 0x0be91b91);
- CLASSERT (IBNAL_MSG_VERSION ==
5
);
+ CLASSERT (IBNAL_MSG_VERSION ==
6
);
CLASSERT (IBNAL_MSG_CONNREQ == 0xc0);
CLASSERT (IBNAL_MSG_CONNACK == 0xc1);
CLASSERT (IBNAL_MSG_NOOP == 0xd0);
CLASSERT (IBNAL_MSG_CONNREQ == 0xc0);
CLASSERT (IBNAL_MSG_CONNACK == 0xc1);
CLASSERT (IBNAL_MSG_NOOP == 0xd0);
@@
-1297,7
+1297,7
@@
kibnal_alloc_pages (kib_pages_t **pp, int npages, int allow_write)
for (i = 0; i < npages; i++) {
phys_pages[i].size = PAGE_SIZE;
for (i = 0; i < npages; i++) {
phys_pages[i].size = PAGE_SIZE;
- phys_pages[i].start =
page_to_
phys(p->ibp_pages[i]);
+ phys_pages[i].start =
kibnal_page2
phys(p->ibp_pages[i]);
}
VV_ACCESS_CONTROL_MASK_SET_ALL(access);
}
VV_ACCESS_CONTROL_MASK_SET_ALL(access);