Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm:
  dlm: always use GFP_NOFS

diff --combined fs/dlm/plock.c
index b540aa5d1f61edf80580a2f360aefd153c3f9a17,2863deb178e2668566607f1548fc6f454ba18d97..b5f89aef3b29c88a1447201504a797eb16e93dcb
--- 1/fs/dlm/plock.c
--- 2/fs/dlm/plock.c
+++ b/fs/dlm/plock.c
@@@ -82,7 -82,7 +82,7 @@@ int dlm_posix_lock(dlm_lockspace_t *loc
        if (!ls)
                return -EINVAL;
  
-       xop = kzalloc(sizeof(*xop), GFP_KERNEL);
+       xop = kzalloc(sizeof(*xop), GFP_NOFS);
        if (!xop) {
                rv = -ENOMEM;
                goto out;
@@@ -143,7 -143,7 +143,7 @@@ out
  }
  EXPORT_SYMBOL_GPL(dlm_posix_lock);
  
 -/* Returns failure iff a succesful lock operation should be canceled */
 +/* Returns failure iff a successful lock operation should be canceled */
  static int dlm_plock_callback(struct plock_op *op)
  {
        struct file *file;
@@@ -211,7 -211,7 +211,7 @@@ int dlm_posix_unlock(dlm_lockspace_t *l
        if (!ls)
                return -EINVAL;
  
-       op = kzalloc(sizeof(*op), GFP_KERNEL);
+       op = kzalloc(sizeof(*op), GFP_NOFS);
        if (!op) {
                rv = -ENOMEM;
                goto out;
@@@ -266,7 -266,7 +266,7 @@@ int dlm_posix_get(dlm_lockspace_t *lock
        if (!ls)
                return -EINVAL;
  
-       op = kzalloc(sizeof(*op), GFP_KERNEL);
+       op = kzalloc(sizeof(*op), GFP_NOFS);
        if (!op) {
                rv = -ENOMEM;
                goto out;