ocfs2: fix type conversion risk when get cluster attributes (41b63efb) · Commits · 戴 / test

In o2nm_cluster, cl_idle_timeout_ms, cl_keepalive_delay_ms, as well as cl_reconnect_delay_ms, are defined as type of unsigned int. So we should also use unsigned int in the helper functions. Signed-off-by:

Joseph Qi <joseph.qi@huawei.com> Cc: Joel Becker <jlbec@evilplan.org> Cc: Mark Fasheh <mfasheh@suse.com> Signed-off-by:

Andrew Morton <akpm@linux-foundation.org> Signed-off-by:

Linus Torvalds <torvalds@linux-foundation.org>

fs/ocfs2/cluster/tcp.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -262,17 +262,17 @@ static void o2net_update_recv_stats(struct o2net_sock_container *sc)

		#endif /* CONFIG_OCFS2_FS_STATS */

		static inline int o2net_reconnect_delay(void)
		static inline unsigned int o2net_reconnect_delay(void)
		{
		return o2nm_single_cluster->cl_reconnect_delay_ms;
		}

		static inline int o2net_keepalive_delay(void)
		static inline unsigned int o2net_keepalive_delay(void)
		{
		return o2nm_single_cluster->cl_keepalive_delay_ms;
		}

		static inline int o2net_idle_timeout(void)
		static inline unsigned int o2net_idle_timeout(void)
		{
		return o2nm_single_cluster->cl_idle_timeout_ms;
		}

Admin message