diff options
| author | Goldwyn Rodrigues | 2014-01-22 00:48:24 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2014-01-22 01:19:41 +0100 |
| commit | 3e8341516409d026636be4d7534b84e6e90bef37 (patch) | |
| tree | ab6d15e41377cf38b709683890e493a3223d2303 /fs/ocfs2/stack_o2cb.c | |
| parent | ocfs2: shift allocation ocfs2_live_connection to user_connect() (diff) | |
| download | kernel-qcow2-linux-3e8341516409d026636be4d7534b84e6e90bef37.tar.gz kernel-qcow2-linux-3e8341516409d026636be4d7534b84e6e90bef37.tar.xz kernel-qcow2-linux-3e8341516409d026636be4d7534b84e6e90bef37.zip | |
ocfs2: pass ocfs2_cluster_connection to ocfs2_this_node
This is done to differentiate between using and not using controld and
use the connection information accordingly.
We need to be backward compatible. So, we use a new enum
ocfs2_connection_type to identify when controld is used and when it is
not.
Signed-off-by: Goldwyn Rodrigues <rgoldwyn@suse.com>
Reviewed-by: Mark Fasheh <mfasheh@suse.de>
Cc: Joel Becker <jlbec@evilplan.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/ocfs2/stack_o2cb.c')
| -rw-r--r-- | fs/ocfs2/stack_o2cb.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/ocfs2/stack_o2cb.c b/fs/ocfs2/stack_o2cb.c index bf1f8930456f..1724d43d3da1 100644 --- a/fs/ocfs2/stack_o2cb.c +++ b/fs/ocfs2/stack_o2cb.c @@ -398,7 +398,8 @@ static int o2cb_cluster_disconnect(struct ocfs2_cluster_connection *conn) return 0; } -static int o2cb_cluster_this_node(unsigned int *node) +static int o2cb_cluster_this_node(struct ocfs2_cluster_connection *conn, + unsigned int *node) { int node_num; |