diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2026-09-05 20:45:18 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2026-09-05 20:45:18 -0700 |
| commit | 1fc5a74b108fc90951890ec513ac81869f5eaff1 (patch) | |
| tree | ddd247abac0e8e148e4ded357db093bee4fe35ed /fs/ext4 | |
| parent | 9f0346dcbea363787186c94ef94dd01aaa215afa (diff) | |
| parent | 3a2c4d55e32ad65efebdb6de44eef3bfa08bb49d (diff) | |
| download | linux-stable-1fc5a74b108fc90951890ec513ac81869f5eaff1.tar.gz linux-stable-1fc5a74b108fc90951890ec513ac81869f5eaff1.zip | |
Merge tag 'kmalloc_obj-v7.3-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux
Pull kmalloc_obj conversions from Kees Cook:
"Another run of the Coccinelle script for converting kmalloc()
family of allocations to kmalloc_obj() via the existing rules
in scripts/coccinelle/api/kmalloc_objs.cocci"
* tag 'kmalloc_obj-v7.3-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
treewide: refresh kmalloc_obj() conversions
drm/amd/display: Fix harmless type mismatch in allocation
Diffstat (limited to 'fs/ext4')
| -rw-r--r-- | fs/ext4/fast_commit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ext4/fast_commit.c b/fs/ext4/fast_commit.c index 062103e42..0cac890cf 100644 --- a/fs/ext4/fast_commit.c +++ b/fs/ext4/fast_commit.c @@ -1116,7 +1116,7 @@ static int ext4_fc_snapshot_inode(struct inode *inode, else if (EXT4_INODE_SIZE(inode->i_sb) > EXT4_GOOD_OLD_INODE_SIZE) inode_len += ei->i_extra_isize; - snap = kmalloc(struct_size(snap, inode_buf, inode_len), GFP_NOFS); + snap = kmalloc_flex(*snap, inode_buf, inode_len, GFP_NOFS); if (!snap) { atomic64_inc(&stats->snap_fail_nomem); ext4_fc_set_snap_err(snap_err, EXT4_FC_SNAP_ERR_NOMEM); @@ -1522,7 +1522,7 @@ static int ext4_fc_alloc_snapshot_inodes(struct super_block *sb, if (nr_inodes > EXT4_FC_SNAPSHOT_MAX_INODES) return -E2BIG; - inodes = kvcalloc(nr_inodes, sizeof(*inodes), GFP_NOFS); + inodes = kvzalloc_objs(*inodes, nr_inodes, GFP_NOFS); if (!inodes) return -ENOMEM; |