diff options
Diffstat (limited to 'fs/dlm/user.c')
-rw-r--r-- | fs/dlm/user.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/dlm/user.c b/fs/dlm/user.c index ebce994ab0b7..e73a4bb572aa 100644 --- a/fs/dlm/user.c +++ b/fs/dlm/user.c | |||
@@ -267,7 +267,7 @@ static int device_user_lock(struct dlm_user_proc *proc, | |||
267 | goto out; | 267 | goto out; |
268 | } | 268 | } |
269 | 269 | ||
270 | ua = kzalloc(sizeof(struct dlm_user_args), GFP_KERNEL); | 270 | ua = kzalloc(sizeof(struct dlm_user_args), GFP_NOFS); |
271 | if (!ua) | 271 | if (!ua) |
272 | goto out; | 272 | goto out; |
273 | ua->proc = proc; | 273 | ua->proc = proc; |
@@ -307,7 +307,7 @@ static int device_user_unlock(struct dlm_user_proc *proc, | |||
307 | if (!ls) | 307 | if (!ls) |
308 | return -ENOENT; | 308 | return -ENOENT; |
309 | 309 | ||
310 | ua = kzalloc(sizeof(struct dlm_user_args), GFP_KERNEL); | 310 | ua = kzalloc(sizeof(struct dlm_user_args), GFP_NOFS); |
311 | if (!ua) | 311 | if (!ua) |
312 | goto out; | 312 | goto out; |
313 | ua->proc = proc; | 313 | ua->proc = proc; |
@@ -352,7 +352,7 @@ static int dlm_device_register(struct dlm_ls *ls, char *name) | |||
352 | 352 | ||
353 | error = -ENOMEM; | 353 | error = -ENOMEM; |
354 | len = strlen(name) + strlen(name_prefix) + 2; | 354 | len = strlen(name) + strlen(name_prefix) + 2; |
355 | ls->ls_device.name = kzalloc(len, GFP_KERNEL); | 355 | ls->ls_device.name = kzalloc(len, GFP_NOFS); |
356 | if (!ls->ls_device.name) | 356 | if (!ls->ls_device.name) |
357 | goto fail; | 357 | goto fail; |
358 | 358 | ||
@@ -520,7 +520,7 @@ static ssize_t device_write(struct file *file, const char __user *buf, | |||
520 | #endif | 520 | #endif |
521 | return -EINVAL; | 521 | return -EINVAL; |
522 | 522 | ||
523 | kbuf = kzalloc(count + 1, GFP_KERNEL); | 523 | kbuf = kzalloc(count + 1, GFP_NOFS); |
524 | if (!kbuf) | 524 | if (!kbuf) |
525 | return -ENOMEM; | 525 | return -ENOMEM; |
526 | 526 | ||
@@ -546,7 +546,7 @@ static ssize_t device_write(struct file *file, const char __user *buf, | |||
546 | 546 | ||
547 | /* add 1 after namelen so that the name string is terminated */ | 547 | /* add 1 after namelen so that the name string is terminated */ |
548 | kbuf = kzalloc(sizeof(struct dlm_write_request) + namelen + 1, | 548 | kbuf = kzalloc(sizeof(struct dlm_write_request) + namelen + 1, |
549 | GFP_KERNEL); | 549 | GFP_NOFS); |
550 | if (!kbuf) { | 550 | if (!kbuf) { |
551 | kfree(k32buf); | 551 | kfree(k32buf); |
552 | return -ENOMEM; | 552 | return -ENOMEM; |
@@ -648,7 +648,7 @@ static int device_open(struct inode *inode, struct file *file) | |||
648 | if (!ls) | 648 | if (!ls) |
649 | return -ENOENT; | 649 | return -ENOENT; |
650 | 650 | ||
651 | proc = kzalloc(sizeof(struct dlm_user_proc), GFP_KERNEL); | 651 | proc = kzalloc(sizeof(struct dlm_user_proc), GFP_NOFS); |
652 | if (!proc) { | 652 | if (!proc) { |
653 | dlm_put_lockspace(ls); | 653 | dlm_put_lockspace(ls); |
654 | return -ENOMEM; | 654 | return -ENOMEM; |