From patchwork Mon Mar 27 08:49:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 9645649 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id CB7F4602D6 for ; Mon, 27 Mar 2017 08:50:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C2C7220952 for ; Mon, 27 Mar 2017 08:50:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B7BB528358; Mon, 27 Mar 2017 08:50:54 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B08A820952 for ; Mon, 27 Mar 2017 08:50:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752250AbdC0Iuw (ORCPT ); Mon, 27 Mar 2017 04:50:52 -0400 Received: from bombadil.infradead.org ([65.50.211.133]:38566 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752427AbdC0Ius (ORCPT ); Mon, 27 Mar 2017 04:50:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=YJY3443Te83xXPtnSL2XVO27QvhNEAP2mw4ue3+uMbM=; b=T2l3/UIhEUlnCg7tjqIsOnl0w EdAnaC992QFmlpUBWyCLkdn4tTukj8I3AUpj+7FXj2S41KtT9NuwDHI07gVnNlOb2X1kNgnejG9+L jLeG9sQfDTFOcIPcMBgKr/KYQoiwXbNta7Mmlgvtad5dfQWDm9OhajyeyBCnHC+dwFhW3ctrkFuCz P0GbyJHWt2FOZv6rX4q9Rc1rul16PvXCGBj3GXk3PShgKBtQyygVW9LaFPuRqon8CQXbp6hvNM4m9 OwYBxZ+Lod1jTR3er42pm3//ZHavqtPJqnfPrtwKJjkdUWdt7SNWf4ZVNudaeWkniVuBP2cWGcunP dv7z6eavg==; Received: from 77-56-156-7.dclient.hispeed.ch ([77.56.156.7] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.87 #1 (Red Hat Linux)) id 1csQM2-0002eo-La; Mon, 27 Mar 2017 08:50:23 +0000 From: Christoph Hellwig Cc: linux-xfs@vger.kernel.org, "Darrick J . Wong" Subject: [PATCH 16/27] xfs: don't fail xfs_extent_busy allocation Date: Mon, 27 Mar 2017 10:49:11 +0200 Message-Id: <20170327084922.11691-17-hch@lst.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170327084922.11691-1-hch@lst.de> References: <20170327084922.11691-1-hch@lst.de> X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html To: unlisted-recipients:; (no To-header on input) Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP commit 5e30c23d13919a718b22d4921dc5c0accc59da27 upstream. We don't just need the structure to track busy extents which can be avoided with a synchronous transaction, but also to keep track of pending discard. Signed-off-by: Christoph Hellwig Reviewed-by: Brian Foster Reviewed-by: Darrick J. Wong Signed-off-by: Darrick J. Wong --- fs/xfs/xfs_extent_busy.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/fs/xfs/xfs_extent_busy.c b/fs/xfs/xfs_extent_busy.c index 162dc186cf04..29c2f997aedf 100644 --- a/fs/xfs/xfs_extent_busy.c +++ b/fs/xfs/xfs_extent_busy.c @@ -45,18 +45,7 @@ xfs_extent_busy_insert( struct rb_node **rbp; struct rb_node *parent = NULL; - new = kmem_zalloc(sizeof(struct xfs_extent_busy), KM_MAYFAIL); - if (!new) { - /* - * No Memory! Since it is now not possible to track the free - * block, make this a synchronous transaction to insure that - * the block is not reused before this transaction commits. - */ - trace_xfs_extent_busy_enomem(tp->t_mountp, agno, bno, len); - xfs_trans_set_sync(tp); - return; - } - + new = kmem_zalloc(sizeof(struct xfs_extent_busy), KM_SLEEP); new->agno = agno; new->bno = bno; new->length = len;