Commit 07c0db77 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'dlm-4.6-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm 

Pull dlm fix from David Teigland:
 "This fixes a bug from the configfs cleanup"

* tag 'dlm-4.6-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:
  dlm: config: Fix ENOMEM failures in make_cluster()
parents 8b8c877f 82c7d823

fs/dlm/config.c

+1 −2
Original line number Diff line number Diff line
@@ -343,13 +343,12 @@ static struct config_group *make_cluster(struct config_group *g, 
	struct dlm_cluster *cl = NULL;

	struct dlm_spaces *sps = NULL;

	struct dlm_comms *cms = NULL;

	void *gps = NULL;



	cl = kzalloc(sizeof(struct dlm_cluster), GFP_NOFS);

	sps = kzalloc(sizeof(struct dlm_spaces), GFP_NOFS);

	cms = kzalloc(sizeof(struct dlm_comms), GFP_NOFS);



	if (!cl || !gps || !sps || !cms)

	if (!cl || !sps || !cms)

		goto fail;



	config_group_init_type_name(&cl->group, name, &cluster_type);