diff options
| author |   Goldwyn Rodrigues <rgoldwyn@suse.de> | 2014-01-21 15:48:24 -0800 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-21 16:19:41 -0800 |
| commit | 3e8341516409d026636be4d7534b84e6e90bef37 (patch) | |
| tree | ab6d15e41377cf38b709683890e493a3223d2303 /fs/ocfs2/dlmglue.c | |
| parent | ocfs2: shift allocation ocfs2_live_connection to user_connect() (diff) | |
| download | linux-dev-3e8341516409d026636be4d7534b84e6e90bef37.tar.xz linux-dev-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 '')
| -rw-r--r-- | fs/ocfs2/dlmglue.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/dlmglue.c b/fs/ocfs2/dlmglue.c index 85852d62aa52..19986959d149 100644 --- a/fs/ocfs2/dlmglue.c +++ b/fs/ocfs2/dlmglue.c @@ -3007,7 +3007,7 @@ int ocfs2_dlm_init(struct ocfs2_super *osb) goto bail; } - status = ocfs2_cluster_this_node(&osb->node_num); + status = ocfs2_cluster_this_node(conn, &osb->node_num); if (status < 0) { mlog_errno(status); mlog(ML_ERROR, |