Commit d70fa34f authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Andrew Morton

ocfs2: Use struct_size()

Use struct_size() instead of hand-writing it, when allocating a structure
with a flex array.

This is less verbose.

Link: https://lkml.kernel.org/r/9d99ea2090739f816d0dc0c4ebaa42b26fc48a9e.1689533270.git.christophe.jaillet@wanadoo.frSigned-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: default avatarJoseph Qi <joseph.qi@linux.alibaba.com>
Cc: Mark Fasheh <mark@fasheh.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Junxiao Bi <junxiao.bi@oracle.com>
Cc: Changwei Ge <gechangwei@live.cn>
Cc: Gang He <ghe@suse.com>
Cc: Jun Piao <piaojun@huawei.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent cb2273a4
...@@ -114,9 +114,9 @@ int ocfs2_compute_replay_slots(struct ocfs2_super *osb) ...@@ -114,9 +114,9 @@ int ocfs2_compute_replay_slots(struct ocfs2_super *osb)
if (osb->replay_map) if (osb->replay_map)
return 0; return 0;
replay_map = kzalloc(sizeof(struct ocfs2_replay_map) + replay_map = kzalloc(struct_size(replay_map, rm_replay_slots,
(osb->max_slots * sizeof(char)), GFP_KERNEL); osb->max_slots),
GFP_KERNEL);
if (!replay_map) { if (!replay_map) {
mlog_errno(-ENOMEM); mlog_errno(-ENOMEM);
return -ENOMEM; return -ENOMEM;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment