diff mbox

Btrfs: fix wrong check for btrfs_force_chunk_alloc()

Message ID 552A1228.4090700@gmail.com (mailing list archive)
State Accepted
Headers show

Commit Message

Wang Shilong April 12, 2015, 6:35 a.m. UTC
btrfs_force_chunk_alloc() return 1 for allocation chunk successfully.
This problem exists since commit c87f08ca4.

With this patch, we might fix some enospc problems for balances.

Signed-off-by: Wang Shilong <wangshilong1991@gmail.com>
---
 fs/btrfs/relocation.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Filipe Manana June 30, 2015, 10:25 p.m. UTC | #1
On Sun, Apr 12, 2015 at 7:35 AM, Wang Shilong <wangshilong1991@gmail.com> wrote:
> btrfs_force_chunk_alloc() return 1 for allocation chunk successfully.
> This problem exists since commit c87f08ca4.
>
> With this patch, we might fix some enospc problems for balances.
>
> Signed-off-by: Wang Shilong <wangshilong1991@gmail.com>
Reviewed-by: Filipe Manana <fdmanana@suse.com>
Tested-by: Filipe Manana <fdmanana@suse.com>

> ---
>  fs/btrfs/relocation.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
> index d830853..c453464 100644
> --- a/fs/btrfs/relocation.c
> +++ b/fs/btrfs/relocation.c
> @@ -4037,7 +4037,7 @@ restart:
>         if (trans && progress && err == -ENOSPC) {
>                 ret = btrfs_force_chunk_alloc(trans, rc->extent_root,
>                                               rc->block_group->flags);
> -               if (ret == 0) {
> +               if (ret == 1) {
>                         err = 0;
>                         progress = 0;
>                         goto restart;
> --
> 1.7.12.4
> --
> To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
Wang Shilong July 1, 2015, 2:49 a.m. UTC | #2
> On Sun, Apr 12, 2015 at 7:35 AM, Wang Shilong <wangshilong1991@gmail.com> wrote:
>> btrfs_force_chunk_alloc() return 1 for allocation chunk successfully.
>> This problem exists since commit c87f08ca4.
>>
>> With this patch, we might fix some enospc problems for balances.
>>
>> Signed-off-by: Wang Shilong <wangshilong1991@gmail.com>
> Reviewed-by: Filipe Manana <fdmanana@suse.com>
> Tested-by: Filipe Manana <fdmanana@suse.com>

Thanks Filipe!

Regards,
Shilong

> 
>> ---
>>  fs/btrfs/relocation.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
>> index d830853..c453464 100644
>> --- a/fs/btrfs/relocation.c
>> +++ b/fs/btrfs/relocation.c
>> @@ -4037,7 +4037,7 @@ restart:
>>         if (trans && progress && err == -ENOSPC) {
>>                 ret = btrfs_force_chunk_alloc(trans, rc->extent_root,
>>                                               rc->block_group->flags);
>> -               if (ret == 0) {
>> +               if (ret == 1) {
>>                         err = 0;
>>                         progress = 0;
>>                         goto restart;
>> --
>> 1.7.12.4
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 
> 
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
index d830853..c453464 100644
--- a/fs/btrfs/relocation.c
+++ b/fs/btrfs/relocation.c
@@ -4037,7 +4037,7 @@  restart:
 	if (trans && progress && err == -ENOSPC) {
 		ret = btrfs_force_chunk_alloc(trans, rc->extent_root,
 					      rc->block_group->flags);
-		if (ret == 0) {
+		if (ret == 1) {
 			err = 0;
 			progress = 0;
 			goto restart;