diff options
| author | Zach Brown <zab@redhat.com> | 2014-05-09 17:15:09 -0400 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2014-06-09 17:20:22 -0700 |
| commit | 774bcb35f0d9ccb9adfd3a391328cc25523659fc (patch) | |
| tree | a4f6f0adf7068fbfe7f0f4bd066f09d045692902 | |
| parent | 60e1975acb48fc3d74a3422b21dde74c977ac3d5 (diff) | |
| download | linux-stable-774bcb35f0d9ccb9adfd3a391328cc25523659fc.tar.gz linux-stable-774bcb35f0d9ccb9adfd3a391328cc25523659fc.tar.bz2 linux-stable-774bcb35f0d9ccb9adfd3a391328cc25523659fc.zip | |
btrfs: return ptr error from compression workspace
The btrfs compression wrappers translated errors from workspace
allocation to either -ENOMEM or -1. The compression type workspace
allocators are already returning a ERR_PTR(-ENOMEM). Just return that
and get rid of the magical -1.
This helps a future patch return errors from the compression wrappers.
Signed-off-by: Zach Brown <zab@redhat.com>
Reviewed-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Chris Mason <clm@fb.com>
| -rw-r--r-- | fs/btrfs/compression.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c index d43c544d3b68..92371c414228 100644 --- a/fs/btrfs/compression.c +++ b/fs/btrfs/compression.c @@ -887,7 +887,7 @@ int btrfs_compress_pages(int type, struct address_space *mapping, workspace = find_workspace(type); if (IS_ERR(workspace)) - return -1; + return PTR_ERR(workspace); ret = btrfs_compress_op[type-1]->compress_pages(workspace, mapping, start, len, pages, @@ -923,7 +923,7 @@ static int btrfs_decompress_biovec(int type, struct page **pages_in, workspace = find_workspace(type); if (IS_ERR(workspace)) - return -ENOMEM; + return PTR_ERR(workspace); ret = btrfs_compress_op[type-1]->decompress_biovec(workspace, pages_in, disk_start, @@ -945,7 +945,7 @@ int btrfs_decompress(int type, unsigned char *data_in, struct page *dest_page, workspace = find_workspace(type); if (IS_ERR(workspace)) - return -ENOMEM; + return PTR_ERR(workspace); ret = btrfs_compress_op[type-1]->decompress(workspace, data_in, dest_page, start_byte, |