Skip to contentSkip to conversation

Btrfs: fix wrong check for btrfs_force_chunk_alloc()

PATCH In review Wang Shilong 2 participants 3 messages Apr 12, 2015 – Jul 1, 2015 Btrfs file system

lore
Share & tools
lore

Wang Shilong

author
#0 lore raw

PATCH 1/1 Btrfs: fix wrong check for btrfs_force_chunk_alloc()

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 <[email protected]>
---
 fs/btrfs/relocation.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
fs/btrfs/relocation.c +1 -1
index d830853..c453464 100644
@@ -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;
Signature · 1 line
1.7.12.4
Reviewed-by Filipe Manana Tested-by Filipe Manana on v1 1/1
#1 lore raw
Quoted 6 lines · Wang Shilong

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 <[email protected]>
Reviewed-by Filipe Manana <[email protected]>
Tested-by Filipe Manana <[email protected]>
Quoted 23 lines
---
 fs/btrfs/relocation.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
fs/btrfs/relocation.c +1 -2
index d830853..c453464 100644
@@ -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 [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Signature · 5 lines
Filipe David Manana,

"Reasonable men adapt themselves to the world.
 Unreasonable men adapt the world to themselves.
 That's why all progress depends on unreasonable men."
author
#2 lore raw
Quoted 10 lines · Wang Shilong
Quoted 6 lines

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 <[email protected]>
Reviewed-by Filipe Manana <[email protected]>
Tested-by Filipe Manana <[email protected]>

Thanks Filipe!

Regards,
Shilong

Quoted 27 lines
Quoted 24 lines
---
 fs/btrfs/relocation.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
fs/btrfs/relocation.c +1 -2
index d830853..c453464 100644
@@ -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 [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html