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
LU-14390 gnilnd: Use DIV_ROUND_UP to calculate niov
[fs/lustre-release.git]
/
lnet
/
klnds
/
gnilnd
/
gnilnd_cb.c
diff --git
a/lnet/klnds/gnilnd/gnilnd_cb.c
b/lnet/klnds/gnilnd/gnilnd_cb.c
index
5f838b1
..
edd60ce
100644
(file)
--- 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 {
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",
LASSERTF(niov > 0 && niov < GNILND_MAX_IMMEDIATE/PAGE_SIZE,
"bad niov %d msg %p kiov %p offset %d nob%d\n",