diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-10 20:33:59 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-10 20:33:59 +0300 |
commit | 02412f49f6a7e35753d9af49d92662fb562fc9fa (patch) | |
tree | ecf4c573ff8944227ca04e342e97ab17493cda5c /fs/dlm/requestqueue.c | |
parent | 4515c3069da5bfb6f08dbfca499464b4cbdfcb50 (diff) | |
parent | 573c24c4af6664ffcd9aa7ba617a35fde2b95534 (diff) | |
download | linux-02412f49f6a7e35753d9af49d92662fb562fc9fa.tar.xz |
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: always use GFP_NOFS
Diffstat (limited to 'fs/dlm/requestqueue.c')
-rw-r--r-- | fs/dlm/requestqueue.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/dlm/requestqueue.c b/fs/dlm/requestqueue.c index 7a2307c08911..a44fa22890e1 100644 --- a/fs/dlm/requestqueue.c +++ b/fs/dlm/requestqueue.c @@ -35,7 +35,7 @@ void dlm_add_requestqueue(struct dlm_ls *ls, int nodeid, struct dlm_message *ms) struct rq_entry *e; int length = ms->m_header.h_length - sizeof(struct dlm_message); - e = kmalloc(sizeof(struct rq_entry) + length, ls->ls_allocation); + e = kmalloc(sizeof(struct rq_entry) + length, GFP_NOFS); if (!e) { log_print("dlm_add_requestqueue: out of memory len %d", length); return; |