diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-10 09:33:59 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-10 09:33:59 -0800 |
| commit | 02412f49f6a7e35753d9af49d92662fb562fc9fa (patch) | |
| tree | ecf4c573ff8944227ca04e342e97ab17493cda5c /fs/dlm/plock.c | |
| parent | 4515c3069da5bfb6f08dbfca499464b4cbdfcb50 (diff) | |
| parent | 573c24c4af6664ffcd9aa7ba617a35fde2b95534 (diff) | |
| download | renesas_kernel-02412f49f6a7e35753d9af49d92662fb562fc9fa.tar.gz renesas_kernel-02412f49f6a7e35753d9af49d92662fb562fc9fa.tar.bz2 renesas_kernel-02412f49f6a7e35753d9af49d92662fb562fc9fa.zip | |
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 b540aa5d1f6..b5f89aef3b2 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; |