From: Greg Kroah-Hartman Date: Fri, 19 Jun 2015 20:33:24 +0000 (-0700) Subject: update 4.0 btrfs patch X-Git-Tag: v3.10.81~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=462725ddd18931c13c330ea87a0dde8b3a7950d2;p=thirdparty%2Fkernel%2Fstable-queue.git update 4.0 btrfs patch --- diff --git a/queue-4.0/btrfs-fix-regression-in-raid-level-conversion.patch b/queue-4.0/btrfs-fix-regression-in-raid-level-conversion.patch index 2e3ceec7956..3372747329e 100644 --- a/queue-4.0/btrfs-fix-regression-in-raid-level-conversion.patch +++ b/queue-4.0/btrfs-fix-regression-in-raid-level-conversion.patch @@ -23,18 +23,19 @@ partial revert of 2f0810880, and don't error out if we hit ENOSPC. Signed-off-by: Chris Mason Tested-by: Dave Sterba Reported-by: Holger Hoffstaette +[adapted for stable kernel branch, v4.0.5] +Signed-off-by: David Sterba Signed-off-by: Greg Kroah-Hartman - --- fs/btrfs/extent-tree.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c -@@ -8484,6 +8484,24 @@ static int set_block_group_ro(struct btr - u64 min_allocable_bytes; - int ret = -ENOSPC; - +@@ -8535,6 +8535,24 @@ int btrfs_set_block_group_ro(struct btrf + trans = btrfs_join_transaction(root); + if (IS_ERR(trans)) + return PTR_ERR(trans); + /* + * if we are changing raid levels, try to allocate a corresponding + * block group with the new raid level. @@ -54,5 +55,5 @@ Signed-off-by: Greg Kroah-Hartman + goto out; + } - /* - * We need some metadata space and system metadata space for + ret = set_block_group_ro(cache, 0); + if (!ret)