Skip to contentSkip to conversation

Patch "btrfs: csum_tree_block: return proper errno value" has been added to the 4.5-stable tree

PATCH [email protected] 1 participant 1 message May 17, 2016

Subsystems (2)
Stable branch Btrfs file system
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

btrfs: csum_tree_block: return proper errno value

to the 4.5-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
btrfs-csum_tree_block-return-proper-errno-value.patch
and it can be found in the queue-4.5 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 8bd98f0e6bf792e8fa7c3fed709321ad42ba8d2e Mon Sep 17 00:00:00 2001

From: Alex Lyakas <[email protected]>
Date: Thu, 10 Mar 2016 13:09:46 +0200
Subject: btrfs: csum_tree_block: return proper errno value

From: Alex Lyakas <[email protected]>

commit 8bd98f0e6bf792e8fa7c3fed709321ad42ba8d2e upstream.

Signed-off-by Alex Lyakas <[email protected]>
Reviewed-by Filipe Manana <[email protected]>
Signed-off-by David Sterba <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
---
 fs/btrfs/disk-io.c |   13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)
fs/btrfs/disk-io.c +5 -8
@@ -303,7 +303,7 @@ static int csum_tree_block(struct btrfs_
 		err = map_private_extent_buffer(buf, offset, 32,
 					&kaddr, &map_start, &map_len);
 		if (err)
-			return 1;
+			return err;
 		cur_len = min(len, map_len - (offset - map_start));
 		crc = btrfs_csum_data(kaddr + offset - map_start,
 				      crc, cur_len);

@@ -313,7 +313,7 @@ static int csum_tree_block(struct btrfs_
 	if (csum_size > sizeof(inline_result)) {
 		result = kzalloc(csum_size, GFP_NOFS);
 		if (!result)
-			return 1;
+			return -ENOMEM;
 	} else {
 		result = (char *)&inline_result;
 	}

@@ -334,7 +334,7 @@ static int csum_tree_block(struct btrfs_
 				val, found, btrfs_header_level(buf));
 			if (result != (char *)&inline_result)
 				kfree(result);
-			return 1;
+			return -EUCLEAN;
 		}
 	} else {
 		write_extent_buffer(buf, result, 0, csum_size);

@@ -516,8 +516,7 @@ static int csum_dirty_buffer(struct btrf
 	found_start = btrfs_header_bytenr(eb);
 	if (WARN_ON(found_start != start || !PageUptodate(page)))
 		return 0;
-	csum_tree_block(fs_info, eb, 0);
-	return 0;
+	return csum_tree_block(fs_info, eb, 0);
 }
 
 static int check_tree_block_fsid(struct btrfs_fs_info *fs_info,

@@ -660,10 +659,8 @@ static int btree_readpage_end_io_hook(st
 				       eb, found_level);
 
 	ret = csum_tree_block(root->fs_info, eb, 1);
-	if (ret) {
-		ret = -EIO;
+	if (ret)
 		goto err;
-	}
 
 	/*
 	 * If this is a leaf block and it is corrupt, set the corrupt bit so

Patches currently in stable-queue which might be from [email protected] are

queue-4.5/btrfs-csum_tree_block-return-proper-errno-value.patch queue-4.5/btrfs-do-not-write-corrupted-metadata-blocks-to-disk.patch