diff options
| author | David Teigland <teigland@redhat.com> | 2009-05-15 10:50:57 -0500 |
|---|---|---|
| committer | David Teigland <teigland@redhat.com> | 2009-05-15 11:24:59 -0500 |
| commit | 748285ccf7ea76d3d76d0d5f2945ad6fb91f5329 (patch) | |
| tree | aeb56a0e18c2f54acccb65e5b6e8ac63f53dfc44 /fs/dlm/dir.c | |
| parent | 391fbdc5d527149578490db2f1619951d91f3561 (diff) | |
| download | kernel_samsung_smdk4412-748285ccf7ea76d3d76d0d5f2945ad6fb91f5329.zip kernel_samsung_smdk4412-748285ccf7ea76d3d76d0d5f2945ad6fb91f5329.tar.gz kernel_samsung_smdk4412-748285ccf7ea76d3d76d0d5f2945ad6fb91f5329.tar.bz2 | |
dlm: use more NOFS allocation
Change some GFP_KERNEL allocations to use either GFP_NOFS or
ls_allocation (when available) which the fs sets to GFP_NOFS.
The point is to prevent allocations from going back into the
cluster fs in places where that might lead to deadlock.
Signed-off-by: David Teigland <teigland@redhat.com>
Diffstat (limited to 'fs/dlm/dir.c')
| -rw-r--r-- | fs/dlm/dir.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/dlm/dir.c b/fs/dlm/dir.c index 858fba1..c4dfa1d 100644 --- a/fs/dlm/dir.c +++ b/fs/dlm/dir.c @@ -49,7 +49,8 @@ static struct dlm_direntry *get_free_de(struct dlm_ls *ls, int len) spin_unlock(&ls->ls_recover_list_lock); if (!found) - de = kzalloc(sizeof(struct dlm_direntry) + len, GFP_KERNEL); + de = kzalloc(sizeof(struct dlm_direntry) + len, + ls->ls_allocation); return de; } @@ -211,7 +212,7 @@ int dlm_recover_directory(struct dlm_ls *ls) dlm_dir_clear(ls); - last_name = kmalloc(DLM_RESNAME_MAXLEN, GFP_KERNEL); + last_name = kmalloc(DLM_RESNAME_MAXLEN, ls->ls_allocation); if (!last_name) goto out; @@ -322,7 +323,7 @@ static int get_entry(struct dlm_ls *ls, int nodeid, char *name, if (namelen > DLM_RESNAME_MAXLEN) return -EINVAL; - de = kzalloc(sizeof(struct dlm_direntry) + namelen, GFP_KERNEL); + de = kzalloc(sizeof(struct dlm_direntry) + namelen, ls->ls_allocation); if (!de) return -ENOMEM; |