fix up btrfs patch for 4.9 and 4.14

diff --git a/queue-4.14/btrfs-fix-block-group-leak-when-removing-fails.patch b/queue-4.14/btrfs-fix-block-group-leak-when-removing-fails.patch
index d02836f747ca311b9f1b58807136aa4e15335105..b5efc36a1aa44ee5103eba1cca68d655bfb20973 100644 (file)
--- a/queue-4.14/btrfs-fix-block-group-leak-when-removing-fails.patch
+++ b/queue-4.14/btrfs-fix-block-group-leak-when-removing-fails.patch
@@ -82,14 +82,14 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
        btrfs_put_block_group(block_group);
  
        ret = btrfs_search_slot(trans, root, &key, path, -1, 1);
-@@ -11037,6 +11037,10 @@ int btrfs_init_space_info(struct btrfs_f
-               flags = BTRFS_BLOCK_GROUP_DATA;
-               ret = create_space_info(fs_info, flags, &space_info);
-       }
+@@ -10790,6 +10790,10 @@ int btrfs_remove_block_group(struct btrf
+               goto out;
+ 
+       ret = btrfs_del_item(trans, root, path);
 +
 +out_put_group:
 +      /* Once for the lookup reference */
 +      btrfs_put_block_group(block_group);
  out:
+       btrfs_free_path(path);
        return ret;
- }

diff --git a/queue-4.9/btrfs-fix-block-group-leak-when-removing-fails.patch b/queue-4.9/btrfs-fix-block-group-leak-when-removing-fails.patch
index a80218efde7de1c39af4fe36ed818343f50d4c4e..c0e7293985dac176e5260bcaf100edd0f55db697 100644 (file)
--- a/queue-4.9/btrfs-fix-block-group-leak-when-removing-fails.patch
+++ b/queue-4.9/btrfs-fix-block-group-leak-when-removing-fails.patch
@@ -82,14 +82,14 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
        btrfs_put_block_group(block_group);
  
        ret = btrfs_search_slot(trans, root, &key, path, -1, 1);
-@@ -11131,6 +11131,10 @@ int btrfs_init_space_info(struct btrfs_f
-               flags = BTRFS_BLOCK_GROUP_DATA;
-               ret = update_space_info(fs_info, flags, 0, 0, 0, &space_info);
-       }
+@@ -10883,6 +10883,10 @@ int btrfs_remove_block_group(struct btrf
+               goto out;
+ 
+       ret = btrfs_del_item(trans, root, path);
 +
 +out_put_group:
 +      /* Once for the lookup reference */
 +      btrfs_put_block_group(block_group);
  out:
+       btrfs_free_path(path);
        return ret;
- }