Commit e5f2cb2b authored by Wengang Wang's avatar Wengang Wang Committed by Joel Becker
Browse files

ocfs2: fix a misleading variable name 



a local variable "dlm_version" is used as a fs locking version.
rename it fs_version.

Signed-off-by: default avatarWengang Wang <wen.gang.wang@oracle.com>
Signed-off-by: default avatarJoel Becker <joel.becker@oracle.com>
parent 1097df3f

fs/ocfs2/stack_o2cb.c

+6 −6
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ static int o2cb_cluster_connect(struct ocfs2_cluster_connection *conn) 
	u32 dlm_key;

	struct dlm_ctxt *dlm;

	struct o2dlm_private *priv;

	struct dlm_protocol_version dlm_version;

	struct dlm_protocol_version fs_version;



	BUG_ON(conn == NULL);

	BUG_ON(o2cb_stack.sp_proto == NULL);
@@ -304,18 +304,18 @@ static int o2cb_cluster_connect(struct ocfs2_cluster_connection *conn) 
	/* used by the dlm code to make message headers unique, each

	 * node in this domain must agree on this. */

	dlm_key = crc32_le(0, conn->cc_name, conn->cc_namelen);

	dlm_version.pv_major = conn->cc_version.pv_major;

	dlm_version.pv_minor = conn->cc_version.pv_minor;

	fs_version.pv_major = conn->cc_version.pv_major;

	fs_version.pv_minor = conn->cc_version.pv_minor;



	dlm = dlm_register_domain(conn->cc_name, dlm_key, &dlm_version);

	dlm = dlm_register_domain(conn->cc_name, dlm_key, &fs_version);

	if (IS_ERR(dlm)) {

		rc = PTR_ERR(dlm);

		mlog_errno(rc);

		goto out_free;

	}



	conn->cc_version.pv_major = dlm_version.pv_major;

	conn->cc_version.pv_minor = dlm_version.pv_minor;

	conn->cc_version.pv_major = fs_version.pv_major;

	conn->cc_version.pv_minor = fs_version.pv_minor;

	conn->cc_lockspace = dlm;



	dlm_register_eviction_cb(dlm, &priv->op_eviction_cb);