dlm: fix up memory allocation flags
David Teigland
maintainerPATCH 1/10 dlm: fix up memory allocation flags
From: Steven Whitehouse <[email protected]>
Use ls_allocation for memory allocations, which a cluster fs sets to GFP_NOFS. Use GFP_NOFS for allocations when no lockspace struct is available. Taking dlm locks needs to avoid calling back into the cluster fs because write-out can require taking dlm locks.
Cc Christine Caulfield <[email protected]>
Signed-off-by Steven Whitehouse <[email protected]>
Signed-off-by David Teigland <[email protected]>
--- fs/dlm/lowcomms.c | 1 + fs/dlm/memory.c | 6 +++--- fs/dlm/midcomms.c | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-)
fs/dlm/lowcomms.c +1 -0
@@ -295,6 +295,7 @@ static int add_sock(struct socket *sock, struct connection *con) con->sock->sk->sk_write_space = lowcomms_write_space; con->sock->sk->sk_state_change = lowcomms_state_change; con->sock->sk->sk_user_data = con; + con->sock->sk->sk_allocation =GFP_NOFS ;return 0 ; }
fs/dlm/memory.c +3 -3
@@ -39,7 +39,7 @@ char *dlm_allocate_lvb(struct dlm_ls *ls) {char *p; - p =kzalloc (ls->ls_lvblen,GFP_KERNEL ); + p =kzalloc (ls->ls_lvblen, ls->ls_allocation);return p; }
@@ -57,7 +57,7 @@ struct dlm_rsb *dlm_allocate_rsb(struct dlm_ls *ls, int namelen) DLM_ASSERT(namelen <= DLM_RESNAME_MAXLEN,); - r =kzalloc (sizeof (*r) + namelen,GFP_KERNEL ); + r =kzalloc (sizeof (*r) + namelen, ls->ls_allocation);return r; }
@@ -72,7 +72,7 @@ struct dlm_lkb *dlm_allocate_lkb(struct dlm_ls *ls) {struct dlm_lkb *lkb; - lkb =kmem_cache_zalloc (lkb_cache,GFP_KERNEL ); + lkb =kmem_cache_zalloc (lkb_cache, ls->ls_allocation);return lkb; }
fs/dlm/midcomms.c +1 -1
@@ -112,7 +112,7 @@ int dlm_process_incoming_buffer(int nodeid, const void *base,ordinary messages). */ if (msglen >sizeof (__tmp) && p == &__tmp.p) { - p =kmalloc (dlm_config.ci_buffer_size,GFP_KERNEL ); + p =kmalloc (dlm_config.ci_buffer_size,GFP_NOFS );if (p ==NULL )return ret; }
Signature · 1 line
1.5.5.1