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-9679 modules: convert MIN/MAX to kernel style
[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
93cae3d
..
4cff9ed
100644
(file)
--- a/
lnet/klnds/gnilnd/gnilnd_cb.c
+++ b/
lnet/klnds/gnilnd/gnilnd_cb.c
@@
-2800,7
+2800,7
@@
kgnilnd_check_peer_timeouts_locked(kgn_peer_t *peer, struct list_head *todie,
peer, libcfs_nid2str(peer->gnp_nid),
peer->gnp_reconnect_interval);
peer, libcfs_nid2str(peer->gnp_nid),
peer->gnp_reconnect_interval);
- timeout = cfs_time_seconds(
MAX
(*kgnilnd_tunables.kgn_timeout,
+ timeout = cfs_time_seconds(
max
(*kgnilnd_tunables.kgn_timeout,
GNILND_MIN_TIMEOUT));
conn = kgnilnd_find_conn_locked(peer);
GNILND_MIN_TIMEOUT));
conn = kgnilnd_find_conn_locked(peer);