diff options
| author | Mark Fasheh <mfasheh@suse.com> | 2008-01-29 16:59:56 -0800 |
|---|---|---|
| committer | Mark Fasheh <mfasheh@suse.com> | 2008-04-18 08:56:04 -0700 |
| commit | 0abd6d1803b01c741430af270026d1d95a103d9c (patch) | |
| tree | c1aca3d286990be6f9043e28ad0bacaf3443ef54 /fs/ocfs2/dlmglue.c | |
| parent | 6953b4c008628b945bfe0cee97f6e78a98773859 (diff) | |
| download | linux-3.10-0abd6d1803b01c741430af270026d1d95a103d9c.tar.gz linux-3.10-0abd6d1803b01c741430af270026d1d95a103d9c.tar.bz2 linux-3.10-0abd6d1803b01c741430af270026d1d95a103d9c.zip | |
ocfs2: Fill node number during cluster stack init
It doesn't make sense to query for a node number before connecting to the
cluster stack. This should be safe to do because node_num is only just
printed,
and we're actually only moving the setting of node num a small amount
further in the mount process.
[ Disconnect when node query fails -- Joel ]
Reviewed-by: Joel Becker <joel.becker@oracle.com>
Signed-off-by: Mark Fasheh <mfasheh@suse.com>
Diffstat (limited to 'fs/ocfs2/dlmglue.c')
| -rw-r--r-- | fs/ocfs2/dlmglue.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/fs/ocfs2/dlmglue.c b/fs/ocfs2/dlmglue.c index 05fd016ba4b..c7653bb343e 100644 --- a/fs/ocfs2/dlmglue.c +++ b/fs/ocfs2/dlmglue.c @@ -2459,8 +2459,10 @@ int ocfs2_dlm_init(struct ocfs2_super *osb) mlog_entry_void(); - if (ocfs2_mount_local(osb)) + if (ocfs2_mount_local(osb)) { + osb->node_num = 0; goto local; + } status = ocfs2_dlm_init_debug(osb); if (status < 0) { @@ -2487,6 +2489,15 @@ int ocfs2_dlm_init(struct ocfs2_super *osb) goto bail; } + status = ocfs2_cluster_this_node(&osb->node_num); + if (status < 0) { + mlog_errno(status); + mlog(ML_ERROR, + "could not find this host's node number\n"); + ocfs2_cluster_disconnect(conn); + goto bail; + } + local: ocfs2_super_lock_res_init(&osb->osb_super_lockres, osb); ocfs2_rename_lock_res_init(&osb->osb_rename_lockres, osb); |