mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-25 18:30:06 +00:00
ocfs2: call o2quo_exit() if malloc failed in o2net_init()
In o2net_init, if malloc failed, it directly returns -ENOMEM. Then o2quo_exit won't be called in init_o2nm. Signed-off-by: Joseph Qi <joseph.qi@huawei.com> Reviewed-by: joyce.xue <xuejiufei@huawei.com> Cc: Mark Fasheh <mfasheh@suse.com> Cc: Joel Becker <jlbec@evilplan.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
7fa05c6e46
commit
4a4e07c1bd
1 changed files with 11 additions and 7 deletions
|
@ -2146,17 +2146,13 @@ int o2net_init(void)
|
|||
o2quo_init();
|
||||
|
||||
if (o2net_debugfs_init())
|
||||
return -ENOMEM;
|
||||
goto out;
|
||||
|
||||
o2net_hand = kzalloc(sizeof(struct o2net_handshake), GFP_KERNEL);
|
||||
o2net_keep_req = kzalloc(sizeof(struct o2net_msg), GFP_KERNEL);
|
||||
o2net_keep_resp = kzalloc(sizeof(struct o2net_msg), GFP_KERNEL);
|
||||
if (!o2net_hand || !o2net_keep_req || !o2net_keep_resp) {
|
||||
kfree(o2net_hand);
|
||||
kfree(o2net_keep_req);
|
||||
kfree(o2net_keep_resp);
|
||||
return -ENOMEM;
|
||||
}
|
||||
if (!o2net_hand || !o2net_keep_req || !o2net_keep_resp)
|
||||
goto out;
|
||||
|
||||
o2net_hand->protocol_version = cpu_to_be64(O2NET_PROTOCOL_VERSION);
|
||||
o2net_hand->connector_id = cpu_to_be64(1);
|
||||
|
@ -2181,6 +2177,14 @@ int o2net_init(void)
|
|||
}
|
||||
|
||||
return 0;
|
||||
|
||||
out:
|
||||
kfree(o2net_hand);
|
||||
kfree(o2net_keep_req);
|
||||
kfree(o2net_keep_resp);
|
||||
|
||||
o2quo_exit();
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
void o2net_exit(void)
|
||||
|
|
Loading…
Reference in a new issue