Unverified Commit 345482bc authored by Kari Argillander's avatar Kari Argillander Committed by Konstantin Komarov
Browse files

fs/ntfs3: Use kcalloc/kmalloc_array over kzalloc/kmalloc 



Use kcalloc/kmalloc_array over kzalloc/kmalloc when we allocate array.
Checkpatch found these after we did not use our own defined allocation
wrappers.

Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarKari Argillander <kari.argillander@gmail.com>
Signed-off-by: default avatarKonstantin Komarov <almaz.alexandrovich@paragon-software.com>
parent 195c52bd

fs/ntfs3/bitmap.c

+1 −1
Original line number Diff line number Diff line
@@ -683,7 +683,7 @@ int wnd_init(struct wnd_bitmap *wnd, struct super_block *sb, size_t nbits) 
	if (!wnd->bits_last)

		wnd->bits_last = wbits;



	wnd->free_bits = kzalloc(wnd->nwnd * sizeof(u16), GFP_NOFS);

	wnd->free_bits = kcalloc(wnd->nwnd, sizeof(u16), GFP_NOFS);

	if (!wnd->free_bits)

		return -ENOMEM;

fs/ntfs3/file.c

+1 −1
Original line number Diff line number Diff line
@@ -900,7 +900,7 @@ static ssize_t ntfs_compress_write(struct kiocb *iocb, struct iov_iter *from) 
		return -EOPNOTSUPP;

	}



	pages = kmalloc(pages_per_frame * sizeof(struct page *), GFP_NOFS);

	pages = kmalloc_array(pages_per_frame, sizeof(struct page *), GFP_NOFS);

	if (!pages)

		return -ENOMEM;

fs/ntfs3/frecord.c

+3 −4
Original line number Diff line number Diff line
@@ -2054,7 +2054,7 @@ int ni_readpage_cmpr(struct ntfs_inode *ni, struct page *page) 
	idx = (vbo - frame_vbo) >> PAGE_SHIFT;



	pages_per_frame = frame_size >> PAGE_SHIFT;

	pages = kzalloc(pages_per_frame * sizeof(struct page *), GFP_NOFS);

	pages = kcalloc(pages_per_frame, sizeof(struct page *), GFP_NOFS);

	if (!pages) {

		err = -ENOMEM;

		goto out;
@@ -2137,7 +2137,7 @@ int ni_decompress_file(struct ntfs_inode *ni) 
	frame_bits = ni_ext_compress_bits(ni);

	frame_size = 1u << frame_bits;

	pages_per_frame = frame_size >> PAGE_SHIFT;

	pages = kzalloc(pages_per_frame * sizeof(struct page *), GFP_NOFS);

	pages = kcalloc(pages_per_frame, sizeof(struct page *), GFP_NOFS);

	if (!pages) {

		err = -ENOMEM;

		goto out;
@@ -2709,8 +2709,7 @@ int ni_write_frame(struct ntfs_inode *ni, struct page **pages, 
		goto out;

	}



	pages_disk = kzalloc(pages_per_frame * sizeof(struct page *),

			     GFP_NOFS);

	pages_disk = kcalloc(pages_per_frame, sizeof(struct page *), GFP_NOFS);

	if (!pages_disk) {

		err = -ENOMEM;

		goto out;