diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-12 13:17:12 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-12 13:17:12 -0700 |
| commit | c53567ad4528b6efefc3fc22a354d20f6226a098 (patch) | |
| tree | faa289a41715e0a9a174623a76c7d52b10d4a6df /fs/dlm/dir.c | |
| parent | 4ddbac98980fe0a42cf57af5d1032e024aced6a1 (diff) | |
| parent | 748285ccf7ea76d3d76d0d5f2945ad6fb91f5329 (diff) | |
| download | kernel_samsung_espresso10-c53567ad4528b6efefc3fc22a354d20f6226a098.zip kernel_samsung_espresso10-c53567ad4528b6efefc3fc22a354d20f6226a098.tar.gz kernel_samsung_espresso10-c53567ad4528b6efefc3fc22a354d20f6226a098.tar.bz2 | |
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: use more NOFS allocation
dlm: connect to nodes earlier
dlm: fix use count with multiple joins
dlm: Make name input parameter of {,dlm_}new_lockspace() const
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; |