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

Pull dlm update from David Teigland:
 "This set includes one feature, which allows locks that have been
  orphaned to be reacquired"

* tag 'dlm-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:
  dlm: adopt orphan locks
This commit is contained in:
Linus Torvalds
2014-12-10 16:02:12 -08:00
4 changed files with 89 additions and 5 deletions

View File

@@ -114,7 +114,7 @@
*
* DLM_LKF_ORPHAN
*
* not yet implemented
* Acquire an orphan lock.
*
* DLM_LKF_ALTPR
*