diff options
author | Dulshani Gunawardhana <dulshani.gunawardhana89@gmail.com> | 2013-10-31 01:02:18 -0400 |
---|---|---|
committer | Chris Mason <chris.mason@fusionio.com> | 2013-11-11 22:12:22 -0500 |
commit | d9b0d9ba04cf99abff9125b688c03e154598a644 (patch) | |
tree | 19d5fd9776a761379a89a1f87e452973bd9685a1 /fs/btrfs/delayed-inode.c | |
parent | e248e04e7798d234ddbeab6ee6acdec2476fe1a8 (diff) |
btrfs: Replace kmalloc with kmalloc_array
Replace kmalloc(size * nr, ) with kmalloc_array(nr, size), thus making
it easier to check is that the calculation doesn't wrap or return a smaller allocation
Signed-off-by: Dulshani Gunawardhana <dulshani.gunawardhana89@gmail.com>
Reviewed-by: Zach Brown <zab@redhat.com>
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
Diffstat (limited to 'fs/btrfs/delayed-inode.c')
-rw-r--r-- | fs/btrfs/delayed-inode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c index 2bb8e1a988a1..8d292fbae659 100644 --- a/fs/btrfs/delayed-inode.c +++ b/fs/btrfs/delayed-inode.c | |||
@@ -770,13 +770,13 @@ static int btrfs_batch_insert_items(struct btrfs_root *root, | |||
770 | */ | 770 | */ |
771 | btrfs_set_path_blocking(path); | 771 | btrfs_set_path_blocking(path); |
772 | 772 | ||
773 | keys = kmalloc(sizeof(struct btrfs_key) * nitems, GFP_NOFS); | 773 | keys = kmalloc_array(nitems, sizeof(struct btrfs_key), GFP_NOFS); |
774 | if (!keys) { | 774 | if (!keys) { |
775 | ret = -ENOMEM; | 775 | ret = -ENOMEM; |
776 | goto out; | 776 | goto out; |
777 | } | 777 | } |
778 | 778 | ||
779 | data_size = kmalloc(sizeof(u32) * nitems, GFP_NOFS); | 779 | data_size = kmalloc_array(nitems, sizeof(u32), GFP_NOFS); |
780 | if (!data_size) { | 780 | if (!data_size) { |
781 | ret = -ENOMEM; | 781 | ret = -ENOMEM; |
782 | goto error; | 782 | goto error; |