diff options
| author | Chris Mason <clm@fb.com> | 2015-10-21 18:21:40 -0700 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2015-10-21 18:21:40 -0700 |
| commit | a0d58e48db58801a0e764e9b9c87e1782d390fcb (patch) | |
| tree | f413f86da859552a29df58f40d450372977b5673 /fs/btrfs/check-integrity.c | |
| parent | 6db4a7335dd701a0e20275440ee057d3db2a7ae3 (diff) | |
| parent | ddd664f4478a4aaf0ac67a4297e33f1992bc9be2 (diff) | |
| download | linux-a0d58e48db58801a0e764e9b9c87e1782d390fcb.tar.gz linux-a0d58e48db58801a0e764e9b9c87e1782d390fcb.tar.bz2 linux-a0d58e48db58801a0e764e9b9c87e1782d390fcb.zip | |
Merge branch 'cleanups/for-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.4
Diffstat (limited to 'fs/btrfs/check-integrity.c')
| -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 3e20630db8aa..0340c57bf377 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, selected_super = kzalloc(sizeof(*selected_super), GFP_NOFS); if (NULL == selected_super) { printk(KERN_INFO "btrfsic: error, kmalloc failed!\n"); - return -1; + return -ENOMEM; } list_for_each_entry(device, dev_head, dev_list) { @@ -1660,7 +1660,7 @@ static int btrfsic_read_block(struct btrfsic_state *state, sizeof(*block_ctx->pagev)) * num_pages, GFP_NOFS); if (!block_ctx->mem_to_free) - return -1; + return -ENOMEM; block_ctx->datav = block_ctx->mem_to_free; block_ctx->pagev = (struct page **)(block_ctx->datav + num_pages); for (i = 0; i < num_pages; i++) { |