Commit 82c7d823 authored Mar 22, 2016 by Andrew Price Committed by David Teigland Mar 29, 2016

dlm: config: Fix ENOMEM failures in make_cluster()



Commit 1ae1602d "configfs: switch ->default groups to a linked list"
left the NULL gps pointer behind after removing the kcalloc() call which
made it non-NULL. It also left the !gps check in place so make_cluster()
now fails with ENOMEM. Remove the remaining uses of the gps variable to
fix that.

Reviewed-by: Bob Peterson <rpeterso@redhat.com>
Reviewed-by: Andreas Gruenbacher <agruenba@redhat.com>
Signed-off-by: Andrew Price <anprice@redhat.com>
Signed-off-by: David Teigland <teigland@redhat.com>

parent f55532a0

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);

Admin message