diff options
| author | Liu Bo <bo.liu@linux.alibaba.com> | 2018-09-08 04:41:40 +0800 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2018-10-15 17:23:30 +0200 |
| commit | 3b2fd8016069de59f73caca06f7ad60c25f3eb92 (patch) | |
| tree | eca1cafa585e31455fb05547967a98c4fbc988ed /fs/btrfs/check-integrity.c | |
| parent | a27a94c2b0c727517c17cf2ca3a9f7291caadfbc (diff) | |
| download | lwn-3b2fd8016069de59f73caca06f7ad60c25f3eb92.tar.gz lwn-3b2fd8016069de59f73caca06f7ad60c25f3eb92.zip | |
Btrfs: use args in the correct order for kcalloc in btrfsic_read_block
kcalloc is defined as:
kcalloc(size_t n, size_t size, gfp_t flags)
Although this won't cause problems in practice, btrfsic_read_block()
uses kcalloc with n and size in the opposite order.
Reviewed-by: Omar Sandoval <osandov@fb.com>
Signed-off-by: Liu Bo <bo.liu@linux.alibaba.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/check-integrity.c')
| -rw-r--r-- | fs/btrfs/check-integrity.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/btrfs/check-integrity.c b/fs/btrfs/check-integrity.c index 833cf3c35b4d..2e43fba44035 100644 --- a/fs/btrfs/check-integrity.c +++ b/fs/btrfs/check-integrity.c @@ -1594,6 +1594,7 @@ static int btrfsic_read_block(struct btrfsic_state *state, { unsigned int num_pages; unsigned int i; + size_t size; u64 dev_bytenr; int ret; @@ -1608,9 +1609,8 @@ static int btrfsic_read_block(struct btrfsic_state *state, num_pages = (block_ctx->len + (u64)PAGE_SIZE - 1) >> PAGE_SHIFT; - block_ctx->mem_to_free = kcalloc(sizeof(*block_ctx->datav) + - sizeof(*block_ctx->pagev), - num_pages, GFP_NOFS); + size = sizeof(*block_ctx->datav) + sizeof(*block_ctx->pagev); + block_ctx->mem_to_free = kcalloc(num_pages, size, GFP_NOFS); if (!block_ctx->mem_to_free) return -ENOMEM; block_ctx->datav = block_ctx->mem_to_free; |