Home Home > GIT Browse > vanilla
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Marek <mmarek@suse.com>2016-05-11 10:26:33 +0200
committerMichal Marek <mmarek@suse.com>2016-05-11 10:26:33 +0200
commitcd3ce1edfdeef1c5afac6efd351f4b0eca4f4d85 (patch)
tree230d243a974adce1329566c36fbfe8d6ba868772
parentd05d09d6e46d6bbd563d4f854b5ca9af6b9decda (diff)
parent4906a646a04fb70b4ae0a44dd99ecc56d7943ae3 (diff)
Merge branch 'users/zren/SLE12-SP2/for-next' into SLE12-SP2rpm-4.4.9-38
Pull dlm fix from Eric Ren (bsc#979108). suse-commit: 277f9a09325cb86d5ab6ad94c044188a024f85b5
-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);