X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lnet%2Fselftest%2Fconrpc.h;h=bdceea67941a8def56d0fb84d76fbd4079a5dc30;hb=ff8a305376bf8833011ec81d4c3fe750d15597a8;hp=b341f8e5946e8adf57be7c22acfae9973ba32500;hpb=d92bd22523aa9bb1cdb91ded3d46fb180f68a93c;p=fs%2Flustre-release.git diff --git a/lnet/selftest/conrpc.h b/lnet/selftest/conrpc.h index b341f8e..bdceea6 100644 --- a/lnet/selftest/conrpc.h +++ b/lnet/selftest/conrpc.h @@ -49,7 +49,8 @@ #define LST_TRANS_TIMEOUT 30 #define LST_TRANS_MIN_TIMEOUT 3 -#define LST_VALIDATE_TIMEOUT(t) MIN(MAX(t, LST_TRANS_MIN_TIMEOUT), LST_TRANS_TIMEOUT) +#define LST_VALIDATE_TIMEOUT(t) \ + clamp_t(int, t, LST_TRANS_MIN_TIMEOUT, LST_TRANS_TIMEOUT) #define LST_PING_INTERVAL 8 @@ -70,7 +71,7 @@ struct lstcon_rpc { /** RPC is embedded in other structure and can't free it */ unsigned int crp_embedded:1; int crp_status; /* console rpc errors */ - cfs_time_t crp_stamp; /* replied time stamp */ + s64 crp_stamp_ns; /* replied time stamp */ }; struct lstcon_rpc_trans {