diff options
Diffstat (limited to 'fs/dlm/dir.c')
| -rw-r--r-- | fs/dlm/dir.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/fs/dlm/dir.c b/fs/dlm/dir.c index c4dfa1dcc86f..7b84c1dbc82e 100644 --- a/fs/dlm/dir.c +++ b/fs/dlm/dir.c | |||
| @@ -49,8 +49,7 @@ static struct dlm_direntry *get_free_de(struct dlm_ls *ls, int len) | |||
| 49 | spin_unlock(&ls->ls_recover_list_lock); | 49 | spin_unlock(&ls->ls_recover_list_lock); |
| 50 | 50 | ||
| 51 | if (!found) | 51 | if (!found) |
| 52 | de = kzalloc(sizeof(struct dlm_direntry) + len, | 52 | de = kzalloc(sizeof(struct dlm_direntry) + len, GFP_NOFS); |
| 53 | ls->ls_allocation); | ||
| 54 | return de; | 53 | return de; |
| 55 | } | 54 | } |
| 56 | 55 | ||
| @@ -212,7 +211,7 @@ int dlm_recover_directory(struct dlm_ls *ls) | |||
| 212 | 211 | ||
| 213 | dlm_dir_clear(ls); | 212 | dlm_dir_clear(ls); |
| 214 | 213 | ||
| 215 | last_name = kmalloc(DLM_RESNAME_MAXLEN, ls->ls_allocation); | 214 | last_name = kmalloc(DLM_RESNAME_MAXLEN, GFP_NOFS); |
| 216 | if (!last_name) | 215 | if (!last_name) |
| 217 | goto out; | 216 | goto out; |
| 218 | 217 | ||
| @@ -323,7 +322,7 @@ static int get_entry(struct dlm_ls *ls, int nodeid, char *name, | |||
| 323 | if (namelen > DLM_RESNAME_MAXLEN) | 322 | if (namelen > DLM_RESNAME_MAXLEN) |
| 324 | return -EINVAL; | 323 | return -EINVAL; |
| 325 | 324 | ||
| 326 | de = kzalloc(sizeof(struct dlm_direntry) + namelen, ls->ls_allocation); | 325 | de = kzalloc(sizeof(struct dlm_direntry) + namelen, GFP_NOFS); |
| 327 | if (!de) | 326 | if (!de) |
| 328 | return -ENOMEM; | 327 | return -ENOMEM; |
| 329 | 328 | ||
