Skip to content

Commit ca724ed

Browse files
nehebdubeyko
authored andcommitted
hfs/hfxplus: use kzalloc_flex()
Instead of doing the math manually, use kzalloc_flex() which does it in a cleaner way. Also clarifies which is the flexible array member. Signed-off-by: Rosen Penev <rosenp@gmail.com> Reviewed-by: Viacheslav Dubeyko <slava@dubeyko.com> Signed-off-by: Viacheslav Dubeyko <slava@dubeyko.com> Link: https://lore.kernel.org/r/20260425014441.441252-1-rosenp@gmail.com Signed-off-by: Viacheslav Dubeyko <slava@dubeyko.com>
1 parent 7a41fd2 commit ca724ed

2 files changed

Lines changed: 4 additions & 8 deletions

File tree

fs/hfs/bnode.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -344,17 +344,15 @@ static struct hfs_bnode *__hfs_bnode_create(struct hfs_btree *tree, u32 cnid)
344344
struct hfs_bnode *node, *node2;
345345
struct address_space *mapping;
346346
struct page *page;
347-
int size, block, i, hash;
347+
int block, i, hash;
348348
loff_t off;
349349

350350
if (cnid >= tree->node_count) {
351351
pr_err("request for non-existent node %d in B*Tree\n", cnid);
352352
return NULL;
353353
}
354354

355-
size = sizeof(struct hfs_bnode) + tree->pages_per_bnode *
356-
sizeof(struct page *);
357-
node = kzalloc(size, GFP_KERNEL);
355+
node = kzalloc_flex(*node, page, tree->pages_per_bnode, GFP_KERNEL);
358356
if (!node)
359357
return NULL;
360358
node->tree = tree;

fs/hfsplus/bnode.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,7 @@ static struct hfs_bnode *__hfs_bnode_create(struct hfs_btree *tree, u32 cnid)
455455
struct hfs_bnode *node, *node2;
456456
struct address_space *mapping;
457457
struct page *page;
458-
int size, block, i, hash;
458+
int block, i, hash;
459459
loff_t off;
460460

461461
if (cnid >= tree->node_count) {
@@ -464,9 +464,7 @@ static struct hfs_bnode *__hfs_bnode_create(struct hfs_btree *tree, u32 cnid)
464464
return NULL;
465465
}
466466

467-
size = sizeof(struct hfs_bnode) + tree->pages_per_bnode *
468-
sizeof(struct page *);
469-
node = kzalloc(size, GFP_KERNEL);
467+
node = kzalloc_flex(*node, page, tree->pages_per_bnode);
470468
if (!node)
471469
return NULL;
472470
node->tree = tree;

0 commit comments

Comments
 (0)