summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-03-30 21:24:28 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2016-03-30 21:24:28 +0300
commit07c0db771dffe5856c8456e40e2d3066a351e270 (patch)
treea8f1d778efe51ae60a230d1d908baedebf0f1bde
parent8b8c877febd2610050758f1b7b97050a7d2dc794 (diff)
parent82c7d823cc31cf56d964eebe1f91aaf1691cddce (diff)
downloadlinux-07c0db771dffe5856c8456e40e2d3066a351e270.tar.xz
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()
-rw-r--r--fs/dlm/config.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/dlm/config.c b/fs/dlm/config.c
index 519112168a9e..1669f6291c95 100644
--- a/fs/dlm/config.c
+++ b/fs/dlm/config.c
@@ -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);