Browse Source

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>
Zach Brown 11 years ago
parent
commit
774bcb35f0
1 changed files with 3 additions and 3 deletions
  1. 3 3
      fs/btrfs/compression.c

+ 3 - 3
fs/btrfs/compression.c

@@ -887,7 +887,7 @@ int btrfs_compress_pages(int type, struct address_space *mapping,
 
 
 	workspace = find_workspace(type);
 	workspace = find_workspace(type);
 	if (IS_ERR(workspace))
 	if (IS_ERR(workspace))
-		return -1;
+		return PTR_ERR(workspace);
 
 
 	ret = btrfs_compress_op[type-1]->compress_pages(workspace, mapping,
 	ret = btrfs_compress_op[type-1]->compress_pages(workspace, mapping,
 						      start, len, pages,
 						      start, len, pages,
@@ -923,7 +923,7 @@ static int btrfs_decompress_biovec(int type, struct page **pages_in,
 
 
 	workspace = find_workspace(type);
 	workspace = find_workspace(type);
 	if (IS_ERR(workspace))
 	if (IS_ERR(workspace))
-		return -ENOMEM;
+		return PTR_ERR(workspace);
 
 
 	ret = btrfs_compress_op[type-1]->decompress_biovec(workspace, pages_in,
 	ret = btrfs_compress_op[type-1]->decompress_biovec(workspace, pages_in,
 							 disk_start,
 							 disk_start,
@@ -945,7 +945,7 @@ int btrfs_decompress(int type, unsigned char *data_in, struct page *dest_page,
 
 
 	workspace = find_workspace(type);
 	workspace = find_workspace(type);
 	if (IS_ERR(workspace))
 	if (IS_ERR(workspace))
-		return -ENOMEM;
+		return PTR_ERR(workspace);
 
 
 	ret = btrfs_compress_op[type-1]->decompress(workspace, data_in,
 	ret = btrfs_compress_op[type-1]->decompress(workspace, data_in,
 						  dest_page, start_byte,
 						  dest_page, start_byte,