[patch 2/3] OCFS2 Configurable timeouts

Allow configuration of OCFS2 timeouts from userspace via configfs

Signed-off-by: Andrew Beekhof <abeekhof@suse.de>
Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>

diff --cc fs/ocfs2/cluster/nodemanager.c
Simple merge

diff --cc fs/ocfs2/cluster/nodemanager.h
Simple merge

diff --cc fs/ocfs2/cluster/tcp.c
Simple merge

diff --cc fs/ocfs2/cluster/tcp.h
Simple merge

diff --cc fs/ocfs2/cluster/tcp_internal.h
Simple merge