dlm: fix up memory allocation flags (d6d7b702) · Commits · 戴 / test

fs/dlm/lowcomms.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -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;
		}

+3 −3

Original line number	Diff line number	Diff line
		@@ -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;
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}