Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 019d1b22 authored by Mark Fasheh's avatar Mark Fasheh
Browse files

ocfs2: Create locks at initially requested level 



If we have not yet created a cluster lock, ocfs2_cluster_lock() will
first create it at NLMODE, and then convert the lock to either PRMODE or
EXMODE (whichever is requested).

Change ocfs2_cluster_lock() to just create the lock at the initially
requested level. ocfs2_locking_ast() handles this case fine, so the only
update required was in setup of locking state. This should reduce the number
of network messages required for a new lock by one, providing an incremental
performance enhancement.

Signed-off-by: default avatarMark Fasheh <mark.fasheh@oracle.com>
parent 3cf0c507

fs/ocfs2/dlmglue.c

+9 −14
Original line number Diff line number Diff line
@@ -980,18 +980,6 @@ static int ocfs2_cluster_lock(struct ocfs2_super *osb, 
		goto unlock;

	}



	if (!(lockres->l_flags & OCFS2_LOCK_ATTACHED)) {

		/* lock has not been created yet. */

		spin_unlock_irqrestore(&lockres->l_lock, flags);



		ret = ocfs2_lock_create(osb, lockres, LKM_NLMODE, 0);

		if (ret < 0) {

			mlog_errno(ret);

			goto out;

		}

		goto again;

	}



	if (lockres->l_flags & OCFS2_LOCK_BLOCKED &&

	    !ocfs2_may_continue_on_blocked_lock(lockres, level)) {

		/* is the lock is currently blocked on behalf of
@@ -1006,7 +994,14 @@ static int ocfs2_cluster_lock(struct ocfs2_super *osb, 
			mlog(ML_ERROR, "lockres %s has action %u pending\n",

			     lockres->l_name, lockres->l_action);



		if (!(lockres->l_flags & OCFS2_LOCK_ATTACHED)) {

			lockres->l_action = OCFS2_AST_ATTACH;

			lkm_flags &= ~LKM_CONVERT;

		} else {

			lockres->l_action = OCFS2_AST_CONVERT;

			lkm_flags |= LKM_CONVERT;

		}



		lockres->l_requested = level;

		lockres_or_flags(lockres, OCFS2_LOCK_BUSY);

		spin_unlock_irqrestore(&lockres->l_lock, flags);
@@ -1021,7 +1016,7 @@ static int ocfs2_cluster_lock(struct ocfs2_super *osb, 
		status = dlmlock(osb->dlm,

				 level,

				 &lockres->l_lksb,

				 lkm_flags|LKM_CONVERT,

				 lkm_flags,

				 lockres->l_name,

				 OCFS2_LOCK_ID_MAX_LEN - 1,

				 ocfs2_locking_ast,