leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

btrfs: Move free_pages_out label in inline extent handling branch in compress_file_range

Browse Source 
This label is only executed if compress_file_range fails to create an
inline extent. So move its code in the semantically related inline
extent handling branch. No functional changes.

Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Nikolay Borisov 2019-07-17 14:41:45 +03:00 committed by David Sterba
parent ac3e99334d
commit cecc8d9038
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fs/btrfs/inode.c
View File

@ -622,7 +622,14 @@ cont:
PAGE_SET_WRITEBACK | PAGE_SET_WRITEBACK |
page_error_op | page_error_op |
PAGE_END_WRITEBACK); PAGE_END_WRITEBACK);
goto free_pages_out;
for (i = 0; i < nr_pages; i++) {
WARN_ON(pages[i]->mapping);
put_page(pages[i]);
}
kfree(pages);
return 0;
} }
} }
@ -700,15 +707,6 @@ cleanup_and_bail_uncompressed:
compressed_extents++; compressed_extents++;
return compressed_extents; return compressed_extents;
free_pages_out:
for (i = 0; i < nr_pages; i++) {
WARN_ON(pages[i]->mapping);
put_page(pages[i]);
}
kfree(pages);
return 0;
} }
static void free_async_extent_pages(struct async_extent *async_extent) static void free_async_extent_pages(struct async_extent *async_extent)