diff options
| author | David Teigland <teigland@redhat.com> | 2009-11-30 16:34:43 -0600 |
|---|---|---|
| committer | David Teigland <teigland@redhat.com> | 2009-11-30 16:34:43 -0600 |
| commit | 573c24c4af6664ffcd9aa7ba617a35fde2b95534 (patch) | |
| tree | 9222c0c8921fda5b842c2d1007d911d47bd4fe7c /fs/dlm/plock.c | |
| parent | a8a8a669ea13d792296737505adc43ccacf3a648 (diff) | |
| download | linux-3.10-573c24c4af6664ffcd9aa7ba617a35fde2b95534.tar.gz linux-3.10-573c24c4af6664ffcd9aa7ba617a35fde2b95534.tar.bz2 linux-3.10-573c24c4af6664ffcd9aa7ba617a35fde2b95534.zip | |
dlm: always use GFP_NOFS
Replace all GFP_KERNEL and ls_allocation with GFP_NOFS.
ls_allocation would be GFP_KERNEL for userland lockspaces
and GFP_NOFS for file system lockspaces.
It was discovered that any lockspaces on the system can
affect all others by triggering memory reclaim in the
file system which could in turn call back into the dlm
to acquire locks, deadlocking dlm threads that were
shared by all lockspaces, like dlm_recv.
Signed-off-by: David Teigland <teigland@redhat.com>
Diffstat (limited to 'fs/dlm/plock.c')
| -rw-r--r-- | fs/dlm/plock.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/dlm/plock.c b/fs/dlm/plock.c index 16f682e26c0..2863deb178e 100644 --- a/fs/dlm/plock.c +++ b/fs/dlm/plock.c @@ -82,7 +82,7 @@ int dlm_posix_lock(dlm_lockspace_t *lockspace, u64 number, struct file *file, if (!ls) return -EINVAL; - xop = kzalloc(sizeof(*xop), GFP_KERNEL); + xop = kzalloc(sizeof(*xop), GFP_NOFS); if (!xop) { rv = -ENOMEM; goto out; @@ -211,7 +211,7 @@ int dlm_posix_unlock(dlm_lockspace_t *lockspace, u64 number, struct file *file, 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 @@ int dlm_posix_get(dlm_lockspace_t *lockspace, u64 number, struct file *file, if (!ls) return -EINVAL; - op = kzalloc(sizeof(*op), GFP_KERNEL); + op = kzalloc(sizeof(*op), GFP_NOFS); if (!op) { rv = -ENOMEM; goto out; |