diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-10 12:33:59 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-10 12:33:59 -0500 |
| commit | 02412f49f6a7e35753d9af49d92662fb562fc9fa (patch) | |
| tree | ecf4c573ff8944227ca04e342e97ab17493cda5c /fs/dlm/plock.c | |
| parent | 4515c3069da5bfb6f08dbfca499464b4cbdfcb50 (diff) | |
| parent | 573c24c4af6664ffcd9aa7ba617a35fde2b95534 (diff) | |
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
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 b540aa5d1f61..b5f89aef3b29 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, | |||
| 82 | if (!ls) | 82 | if (!ls) |
| 83 | return -EINVAL; | 83 | return -EINVAL; |
| 84 | 84 | ||
| 85 | xop = kzalloc(sizeof(*xop), GFP_KERNEL); | 85 | xop = kzalloc(sizeof(*xop), GFP_NOFS); |
| 86 | if (!xop) { | 86 | if (!xop) { |
| 87 | rv = -ENOMEM; | 87 | rv = -ENOMEM; |
| 88 | goto out; | 88 | goto out; |
| @@ -211,7 +211,7 @@ int dlm_posix_unlock(dlm_lockspace_t *lockspace, u64 number, struct file *file, | |||
| 211 | if (!ls) | 211 | if (!ls) |
| 212 | return -EINVAL; | 212 | return -EINVAL; |
| 213 | 213 | ||
| 214 | op = kzalloc(sizeof(*op), GFP_KERNEL); | 214 | op = kzalloc(sizeof(*op), GFP_NOFS); |
| 215 | if (!op) { | 215 | if (!op) { |
| 216 | rv = -ENOMEM; | 216 | rv = -ENOMEM; |
| 217 | goto out; | 217 | goto out; |
| @@ -266,7 +266,7 @@ int dlm_posix_get(dlm_lockspace_t *lockspace, u64 number, struct file *file, | |||
| 266 | if (!ls) | 266 | if (!ls) |
| 267 | return -EINVAL; | 267 | return -EINVAL; |
| 268 | 268 | ||
| 269 | op = kzalloc(sizeof(*op), GFP_KERNEL); | 269 | op = kzalloc(sizeof(*op), GFP_NOFS); |
| 270 | if (!op) { | 270 | if (!op) { |
| 271 | rv = -ENOMEM; | 271 | rv = -ENOMEM; |
| 272 | goto out; | 272 | goto out; |