diff options
Diffstat (limited to 'fs/dlm/plock.c')
-rw-r--r-- | fs/dlm/plock.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/fs/dlm/plock.c b/fs/dlm/plock.c index 16f682e26c07..d45c02db6943 100644 --- a/fs/dlm/plock.c +++ b/fs/dlm/plock.c | |||
@@ -11,6 +11,7 @@ | |||
11 | #include <linux/poll.h> | 11 | #include <linux/poll.h> |
12 | #include <linux/dlm.h> | 12 | #include <linux/dlm.h> |
13 | #include <linux/dlm_plock.h> | 13 | #include <linux/dlm_plock.h> |
14 | #include <linux/slab.h> | ||
14 | 15 | ||
15 | #include "dlm_internal.h" | 16 | #include "dlm_internal.h" |
16 | #include "lockspace.h" | 17 | #include "lockspace.h" |
@@ -82,7 +83,7 @@ int dlm_posix_lock(dlm_lockspace_t *lockspace, u64 number, struct file *file, | |||
82 | if (!ls) | 83 | if (!ls) |
83 | return -EINVAL; | 84 | return -EINVAL; |
84 | 85 | ||
85 | xop = kzalloc(sizeof(*xop), GFP_KERNEL); | 86 | xop = kzalloc(sizeof(*xop), GFP_NOFS); |
86 | if (!xop) { | 87 | if (!xop) { |
87 | rv = -ENOMEM; | 88 | rv = -ENOMEM; |
88 | goto out; | 89 | goto out; |
@@ -143,7 +144,7 @@ out: | |||
143 | } | 144 | } |
144 | EXPORT_SYMBOL_GPL(dlm_posix_lock); | 145 | EXPORT_SYMBOL_GPL(dlm_posix_lock); |
145 | 146 | ||
146 | /* Returns failure iff a succesful lock operation should be canceled */ | 147 | /* Returns failure iff a successful lock operation should be canceled */ |
147 | static int dlm_plock_callback(struct plock_op *op) | 148 | static int dlm_plock_callback(struct plock_op *op) |
148 | { | 149 | { |
149 | struct file *file; | 150 | struct file *file; |
@@ -211,7 +212,7 @@ int dlm_posix_unlock(dlm_lockspace_t *lockspace, u64 number, struct file *file, | |||
211 | if (!ls) | 212 | if (!ls) |
212 | return -EINVAL; | 213 | return -EINVAL; |
213 | 214 | ||
214 | op = kzalloc(sizeof(*op), GFP_KERNEL); | 215 | op = kzalloc(sizeof(*op), GFP_NOFS); |
215 | if (!op) { | 216 | if (!op) { |
216 | rv = -ENOMEM; | 217 | rv = -ENOMEM; |
217 | goto out; | 218 | goto out; |
@@ -266,7 +267,7 @@ int dlm_posix_get(dlm_lockspace_t *lockspace, u64 number, struct file *file, | |||
266 | if (!ls) | 267 | if (!ls) |
267 | return -EINVAL; | 268 | return -EINVAL; |
268 | 269 | ||
269 | op = kzalloc(sizeof(*op), GFP_KERNEL); | 270 | op = kzalloc(sizeof(*op), GFP_NOFS); |
270 | if (!op) { | 271 | if (!op) { |
271 | rv = -ENOMEM; | 272 | rv = -ENOMEM; |
272 | goto out; | 273 | goto out; |