Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 41b63efb authored by Joseph Qi's avatar Joseph Qi Committed by Linus Torvalds
Browse files

ocfs2: fix type conversion risk when get cluster attributes 



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: default avatarJoseph Qi <joseph.qi@huawei.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Mark Fasheh <mfasheh@suse.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8ed6b237

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;

}