Ver código fonte

btrfs: Free checksum list on scrub_extent() fail

When scrub_extent() failed, we need to free previois created
checksum list.

Signed-off-by: Zhao Lei <zhaolei@cn.fujitsu.com>
Signed-off-by: Chris Mason <clm@fb.com>
Zhao Lei 10 anos atrás
pai
commit
6fa96d72f7
1 arquivos alterados com 6 adições e 2 exclusões
  1. 6 2
      fs/btrfs/scrub.c

+ 6 - 2
fs/btrfs/scrub.c

@@ -2924,10 +2924,12 @@ again:
 						      extent_dev, flags,
 						      extent_dev, flags,
 						      generation,
 						      generation,
 						      extent_mirror_num);
 						      extent_mirror_num);
+
+			scrub_free_csums(sctx);
+
 			if (ret)
 			if (ret)
 				goto out;
 				goto out;
 
 
-			scrub_free_csums(sctx);
 			if (extent_logical + extent_len <
 			if (extent_logical + extent_len <
 			    key.objectid + bytes) {
 			    key.objectid + bytes) {
 				logic_start += map->stripe_len;
 				logic_start += map->stripe_len;
@@ -3262,10 +3264,12 @@ again:
 					   extent_physical, extent_dev, flags,
 					   extent_physical, extent_dev, flags,
 					   generation, extent_mirror_num,
 					   generation, extent_mirror_num,
 					   extent_logical - logical + physical);
 					   extent_logical - logical + physical);
+
+			scrub_free_csums(sctx);
+
 			if (ret)
 			if (ret)
 				goto out;
 				goto out;
 
 
-			scrub_free_csums(sctx);
 			if (extent_logical + extent_len <
 			if (extent_logical + extent_len <
 			    key.objectid + bytes) {
 			    key.objectid + bytes) {
 				if (map->type & BTRFS_BLOCK_GROUP_RAID56_MASK) {
 				if (map->type & BTRFS_BLOCK_GROUP_RAID56_MASK) {