diff options
| author | Andrew Price <anprice@redhat.com> | 2016-03-22 18:36:34 +0100 |
|---|---|---|
| committer | David Teigland <teigland@redhat.com> | 2016-03-29 17:28:08 +0200 |
| commit | 82c7d823cc31cf56d964eebe1f91aaf1691cddce (patch) | |
| tree | fb7acd90ac82b9e7714d797ddccdca7550f9bd8d /fs/dlm/config.c | |
| parent | Linux 4.6-rc1 (diff) | |
| download | linux-82c7d823cc31cf56d964eebe1f91aaf1691cddce.tar.xz linux-82c7d823cc31cf56d964eebe1f91aaf1691cddce.zip | |
dlm: config: Fix ENOMEM failures in make_cluster()
Commit 1ae1602de0 "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>
Diffstat (limited to '')
| -rw-r--r-- | fs/dlm/config.c | 3 |
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); |