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

Commit 1cce4df0 authored by Goldwyn Rodrigues's avatar Goldwyn Rodrigues Committed by Linus Torvalds
Browse files

ocfs2: do not lock/unlock() inode DLM lock 



DLM does not cache locks.  So, blocking lock and unlock will only make
the performance worse where contention over the locks is high.

Signed-off-by: default avatarGoldwyn Rodrigues <rgoldwyn@suse.com>
Cc: Mark Fasheh <mfasheh@suse.de>
Cc: Joel Becker <jlbec@evilplan.org>
Reviewed-by: default avatarJunxiao Bi <junxiao.bi@oracle.com>
Cc: Joseph Qi <joseph.qi@huawei.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 1247017f

fs/ocfs2/dlmglue.c

+0 −8
Original line number Diff line number Diff line
@@ -2432,12 +2432,6 @@ int ocfs2_inode_lock_full_nested(struct inode *inode, 
 * done this we have to return AOP_TRUNCATED_PAGE so the aop method

 * that called us can bubble that back up into the VFS who will then

 * immediately retry the aop call.

 *

 * We do a blocking lock and immediate unlock before returning, though, so that

 * the lock has a great chance of being cached on this node by the time the VFS

 * calls back to retry the aop.    This has a potential to livelock as nodes

 * ping locks back and forth, but that's a risk we're willing to take to avoid

 * the lock inversion simply.

 */

int ocfs2_inode_lock_with_page(struct inode *inode,

			      struct buffer_head **ret_bh,
@@ -2449,8 +2443,6 @@ int ocfs2_inode_lock_with_page(struct inode *inode, 
	ret = ocfs2_inode_lock_full(inode, ret_bh, ex, OCFS2_LOCK_NONBLOCK);

	if (ret == -EAGAIN) {

		unlock_page(page);

		if (ocfs2_inode_lock(inode, ret_bh, ex) == 0)

			ocfs2_inode_unlock(inode, ex);

		ret = AOP_TRUNCATED_PAGE;

	}