Commit f0681062 authored by Mark Fasheh's avatar Mark Fasheh
Browse files

ocfs2: Update dlmglue for new dlmlock() API 



File system lock names are very regular right now, so we really only need to
pass an extra parameter to dlmlock().

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

fs/ocfs2/dlmglue.c

+3 −0
Original line number Diff line number Diff line
@@ -810,6 +810,7 @@ static int ocfs2_lock_create(struct ocfs2_super *osb, 
			 &lockres->l_lksb,

			 dlm_flags,

			 lockres->l_name,

			 OCFS2_LOCK_ID_MAX_LEN - 1,

			 lockres->l_ops->ast,

			 lockres,

			 lockres->l_ops->bast);
@@ -999,6 +1000,7 @@ static int ocfs2_cluster_lock(struct ocfs2_super *osb, 
				 &lockres->l_lksb,

				 lkm_flags|LKM_CONVERT|LKM_VALBLK,

				 lockres->l_name,

				 OCFS2_LOCK_ID_MAX_LEN - 1,

				 lockres->l_ops->ast,

				 lockres,

				 lockres->l_ops->bast);
@@ -2419,6 +2421,7 @@ static int ocfs2_downconvert_lock(struct ocfs2_super *osb, 
			 &lockres->l_lksb,

			 dlm_flags,

			 lockres->l_name,

			 OCFS2_LOCK_ID_MAX_LEN - 1,

			 lockres->l_ops->ast,

			 lockres,

			 lockres->l_ops->bast);