diff options
author | Luis de Bethencourt <luisbg@osg.samsung.com> | 2015-10-20 09:56:22 -0400 |
---|---|---|
committer | David Sterba <dsterba@suse.com> | 2015-10-21 12:29:44 -0400 |
commit | 0b8d8ce0297c4376d50318692e0aa53a3aaed90c (patch) | |
tree | 4e8c8951466c5f2deae0d740295587b00e88ebbf | |
parent | d91876496bcf2236efb75ef12378c964bbe8c970 (diff) |
btrfs: check-integrity: Fix returned errno codes
check-integrity is using -1 instead of the -ENOMEM defined macro to
specify that a buffer allocation failed. Since the error number is
propagated, the caller will get a -EPERM which is the wrong error
condition.
Also, the smatch tool complains with the following warnings:
btrfsic_process_superblock() warn: returning -1 instead of -ENOMEM is sloppy
btrfsic_read_block() warn: returning -1 instead of -ENOMEM is sloppy
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: Luis de Bethencourt <luisbg@osg.samsung.com>
Signed-off-by: David Sterba <dsterba@suse.com>
-rw-r--r-- | fs/btrfs/check-integrity.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/check-integrity.c b/fs/btrfs/check-integrity.c index 541fbfaed276..9cacd06cede4 100644 --- a/fs/btrfs/check-integrity.c +++ b/fs/btrfs/check-integrity.c | |||
@@ -667,7 +667,7 @@ static int btrfsic_process_superblock(struct btrfsic_state *state, | |||
667 | selected_super = kzalloc(sizeof(*selected_super), GFP_NOFS); | 667 | selected_super = kzalloc(sizeof(*selected_super), GFP_NOFS); |
668 | if (NULL == selected_super) { | 668 | if (NULL == selected_super) { |
669 | printk(KERN_INFO "btrfsic: error, kmalloc failed!\n"); | 669 | printk(KERN_INFO "btrfsic: error, kmalloc failed!\n"); |
670 | return -1; | 670 | return -ENOMEM; |
671 | } | 671 | } |
672 | 672 | ||
673 | list_for_each_entry(device, dev_head, dev_list) { | 673 | list_for_each_entry(device, dev_head, dev_list) { |
@@ -1660,7 +1660,7 @@ static int btrfsic_read_block(struct btrfsic_state *state, | |||
1660 | sizeof(*block_ctx->pagev)) * | 1660 | sizeof(*block_ctx->pagev)) * |
1661 | num_pages, GFP_NOFS); | 1661 | num_pages, GFP_NOFS); |
1662 | if (!block_ctx->mem_to_free) | 1662 | if (!block_ctx->mem_to_free) |
1663 | return -1; | 1663 | return -ENOMEM; |
1664 | block_ctx->datav = block_ctx->mem_to_free; | 1664 | block_ctx->datav = block_ctx->mem_to_free; |
1665 | block_ctx->pagev = (struct page **)(block_ctx->datav + num_pages); | 1665 | block_ctx->pagev = (struct page **)(block_ctx->datav + num_pages); |
1666 | for (i = 0; i < num_pages; i++) { | 1666 | for (i = 0; i < num_pages; i++) { |