Btrfs: use correct args for kcalloc in btrfsic_read_block
PATCH 1/1 Btrfs: use correct args for kcalloc in btrfsic_read_block
kcalloc is defined askcalloc(size_t n, size_t size, gfp_t flags)
Although this won't cause problems in practice, btrfsic_read_block() has switched n with size.
This updates btrfsic_read_block() to be correct in using kcalloc.
--- fs/btrfs/check-integrity.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
fs/btrfs/check-integrity.c +3 -3
@@ -1594,6 +1594,7 @@ static int btrfsic_read_block(struct btrfsic_state *state, {unsigned int num_pages;unsigned int i; +u64 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;
Signature · 1 line
1.8.3.1
Quoted 18 lines · Liu Bo
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()has switched n with size.This updates
btrfsic_read_block()to be correct in using kcalloc.Signed-off-by Liu Bo <[email protected]>--- fs/btrfs/check-integrity.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)fs/btrfs/check-integrity.c +0
-0
fs/btrfs/check-integrity.c static int btrfsic_read_block(struct btrfsic_state *state, · line 1597
Quoted 4 lines
fs/btrfs/check-integrity.c +1
-0@@ -1594,6 +1594,7 @@ static int btrfsic_read_block(struct btrfsic_state *state, {unsigned int num_pages;unsigned int i; +u64 size;
size_t?
Besides that, Reviewed-by: Omar Sandoval <[email protected]>
Quoted 18 lines
fs/btrfs/check-integrity.c +2
-3u64 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;Signature · 1 line
1.8.3.1
Quoted 14 lines · Omar Sandoval
Quoted 13 lines · Liu Bo
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()has switched n with size.This updates
btrfsic_read_block()to be correct in using kcalloc.Signed-off-by Liu Bo <[email protected]>--- fs/btrfs/check-integrity.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
Quoted 12 lines
fs/btrfs/check-integrity.c static int btrfsic_read_block(struct btrfsic_state *state, · line 1597
Quoted 9 lines
fs/btrfs/check-integrity.c +1
-0@@ -1594,6 +1594,7 @@ static int btrfsic_read_block(struct btrfsic_state *state, {unsigned int num_pages;unsigned int i; +u64 size;
size_t?
oops, will update it.
thanks,
liubo
Quoted 20 lines
Besides that, Reviewed-by: Omar Sandoval <[email protected]>
Quoted 18 lines
fs/btrfs/check-integrity.c +2
-4u64 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; --1.8.3.1
PATCH v2 1/1 Btrfs: use correct args for kcalloc in btrfsic_read_block
In reply to Liu Bokcalloc is defined askcalloc(size_t n, size_t size, gfp_t flags)
Although this won't cause problems in practice, btrfsic_read_block() has switched n with size.
This updates btrfsic_read_block() to be correct in using kcalloc.
---
v2: use size_t to be consistent with kcalloc()'s prototype.
fs/btrfs/check-integrity.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
fs/btrfs/check-integrity.c +3 -3
@@ -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;
Signature · 1 line
1.8.3.1