summaryrefslogtreecommitdiff
path: root/fs/isofs/compress.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/isofs/compress.c')
-rw-r--r--fs/isofs/compress.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/isofs/compress.c b/fs/isofs/compress.c
index 5f3b6da0e022..397568b9c7e7 100644
--- a/fs/isofs/compress.c
+++ b/fs/isofs/compress.c
@@ -75,7 +75,7 @@ static loff_t zisofs_uncompress_block(struct inode *inode, loff_t block_start,
/* Because zlib is not thread-safe, do all the I/O at the top. */
blocknum = block_start >> bufshift;
- bhs = kcalloc(needblocks + 1, sizeof(*bhs), GFP_KERNEL);
+ bhs = kzalloc_objs(*bhs, needblocks + 1);
if (!bhs) {
*errp = -ENOMEM;
return 0;
@@ -156,7 +156,7 @@ static loff_t zisofs_uncompress_block(struct inode *inode, loff_t block_start,
else {
printk(KERN_DEBUG
"zisofs: zisofs_inflate returned"
- " %d, inode = %lu,"
+ " %d, inode = %llu,"
" page idx = %d, bh idx = %d,"
" avail_in = %ld,"
" avail_out = %ld\n",
@@ -333,8 +333,8 @@ static int zisofs_read_folio(struct file *file, struct folio *folio)
full_page = 0;
pcount = 1;
}
- pages = kcalloc(max_t(unsigned int, zisofs_pages_per_cblock, 1),
- sizeof(*pages), GFP_KERNEL);
+ pages = kzalloc_objs(*pages,
+ max_t(unsigned int, zisofs_pages_per_cblock, 1));
if (!pages) {
folio_unlock(folio);
return -ENOMEM;