From patchwork Sun Apr 12 06:35:20 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang Shilong X-Patchwork-Id: 6202621 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C50B19F2EC for ; Sun, 12 Apr 2015 06:35:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0398D2026F for ; Sun, 12 Apr 2015 06:35:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 230CB201DD for ; Sun, 12 Apr 2015 06:35:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750979AbbDLGfZ (ORCPT ); Sun, 12 Apr 2015 02:35:25 -0400 Received: from mail-pa0-f41.google.com ([209.85.220.41]:34039 "EHLO mail-pa0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750925AbbDLGfZ (ORCPT ); Sun, 12 Apr 2015 02:35:25 -0400 Received: by pacyx8 with SMTP id yx8so67445860pac.1 for ; Sat, 11 Apr 2015 23:35:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:subject :content-type:content-transfer-encoding; bh=FUqumCmB7viuuL467LfXOtwc06UlXEy7mo0XE+nbFYE=; b=Klcpn4GQMTtjOyOGimE2wRq+b54BBsadptLPIgB+rfuGvtJIxJ0lab+olg0rEzBct2 eTA2YqGypGmw+Wv0+LS3lnHm/Fd060fc5ICfsuaPq9eWTPl5FuzjEnXiGscTghBk1fZB Wr90xmn+U6ixwg8jBHZBbIIosNzgYTSfOE1FCmmLdQI4fj7zn7D3vVDHuxNpsOVcubuH 6dCn6PxhbouPX/BEq7YFxKPfsM3Im2yYkie2SRU+tezjsuiQXCeSeme/1HujSDB4xdb+ pTe49PPBI1vK/BrtZ+WEom3Uw+jqIL+V9dKrQR0YIRQ4qRFfvcdT5nv3cCmol80cDLfR IKYA== X-Received: by 10.67.22.72 with SMTP id hq8mr16424737pad.154.1428820524744; Sat, 11 Apr 2015 23:35:24 -0700 (PDT) Received: from WangdeMacBook-Pro.local ([104.156.239.76]) by mx.google.com with ESMTPSA id ef3sm3587628pbc.26.2015.04.11.23.35.22 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 11 Apr 2015 23:35:24 -0700 (PDT) Message-ID: <552A1228.4090700@gmail.com> Date: Sun, 12 Apr 2015 14:35:20 +0800 From: Wang Shilong User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.10; rv:24.0) Gecko/20100101 Thunderbird/24.3.0 MIME-Version: 1.0 To: linux-btrfs@vger.kernel.org Subject: [PATCH] Btrfs: fix wrong check for btrfs_force_chunk_alloc() Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Reviewed-by: Filipe Manana Tested-by: Filipe Manana --- 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;