From: Alex Zhuravlev Date: Mon, 25 Jan 2016 11:47:35 +0000 (+0300) Subject: LU-7705 ldlm: make round_timeout() static X-Git-Tag: 2.7.90~31 X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=bb32a147e35f3339832e41e045de68f304ce18cc;p=fs%2Flustre-release.git LU-7705 ldlm: make round_timeout() static to make gcc5 happy. Change-Id: I5e92facd497c04b2595dea3782935f2cc5791de1 Signed-off-by: Alex Zhuravlev Reviewed-on: http://review.whamcloud.com/18119 Tested-by: Jenkins Reviewed-by: James Simmons Tested-by: Maloo Reviewed-by: Bob Glossman Reviewed-by: John L. Hammond Reviewed-by: Dmitry Eremin Reviewed-by: Oleg Drokin --- diff --git a/lustre/ldlm/ldlm_lockd.c b/lustre/ldlm/ldlm_lockd.c index a0586af..bea4a0d 100644 --- a/lustre/ldlm/ldlm_lockd.c +++ b/lustre/ldlm/ldlm_lockd.c @@ -68,7 +68,7 @@ struct ldlm_cb_async_args { static struct ldlm_state *ldlm_state; -inline cfs_time_t round_timeout(cfs_time_t timeout) +static inline cfs_time_t round_timeout(cfs_time_t timeout) { return cfs_time_seconds((int)cfs_duration_sec(cfs_time_sub(timeout, 0)) + 1); }