TononixOS/ubports_kernel_google_msm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge tag 'dlm-fixes-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm

Browse Source 
Pull dlm fixes from David Teigland:
 "This includes one short patch fixing the behavior of the QUECVT flag,
  which the gfs2 folks are waiting on."

* tag 'dlm-fixes-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:
  dlm: fix QUECVT when convert queue is empty
This commit is contained in:
Linus Torvalds
2012-04-23 18:22:42 -07:00
parent aca50bd3b4 53ad1c980d
commit 721b024bd4
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
fs/dlm/lock.c
View File

@@ -1736,6 +1736,18 @@ static int _can_be_granted(struct dlm_rsb *r, struct dlm_lkb *lkb, int now)
if (now && conv && !(lkb->lkb_exflags & DLM_LKF_QUECVT)) if (now && conv && !(lkb->lkb_exflags & DLM_LKF_QUECVT))
return 1; return 1;
/*
* Even if the convert is compat with all granted locks,
* QUECVT forces it behind other locks on the convert queue.
*/
if (now && conv && (lkb->lkb_exflags & DLM_LKF_QUECVT)) {
if (list_empty(&r->res_convertqueue))
return 1;
else
goto out;
}
/* /*
* The NOORDER flag is set to avoid the standard vms rules on grant * The NOORDER flag is set to avoid the standard vms rules on grant
* order. * order.