From patchwork Wed May 23 14:43:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10421607 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 B5A8160327 for ; Wed, 23 May 2018 14:45:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A686B28733 for ; Wed, 23 May 2018 14:45:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9B42428865; Wed, 23 May 2018 14:45:36 +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=-2.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2A1E5289B1 for ; Wed, 23 May 2018 14:45:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 25AFC6B0278; Wed, 23 May 2018 10:45:06 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 1B9C96B0279; Wed, 23 May 2018 10:45:06 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 05CFD6B027A; Wed, 23 May 2018 10:45:06 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl0-f72.google.com (mail-pl0-f72.google.com [209.85.160.72]) by kanga.kvack.org (Postfix) with ESMTP id B49666B0278 for ; Wed, 23 May 2018 10:45:05 -0400 (EDT) Received: by mail-pl0-f72.google.com with SMTP id j1-v6so1839380pll.7 for ; Wed, 23 May 2018 07:45:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references; bh=XKlSObd5waaEUrM9cGkfFRJm5yomFl51q7JbAkunFFQ=; b=I07BRK0SyRf3WzePXf5D+fHaw9vaHP5kACK5QQYW4UDAC84gMaiAN9ZPUR7tnrmN4K MuGjPliabygoifF3bsatMDGWAyuoKN8GsdKAwDUWkkUYOKqF/lrgvwomVbR27rBuRmDd ZtxTWXXSnxRlY9nPtE3lwqVX7nw/e7ucGAXSL3mlj5X2Jn49tTX5z9JnoFaOxaWCCEYv M6hlCPPIZE6QjvXbo2wMJSxUhHgCNk6vkS/yiTYCUWMQOxttSmj7bzA2cPt1awmSSba/ HMSGAbWnLnEd2QsX0m4T7dXjrvl9eoKlgRKRGtlUSQe1diEjwGwQ02lp0i7pmUhJ61NK kxMA== X-Gm-Message-State: ALKqPwfxOBXhuHEdt4MXg+/zf9XTV2qNLed+4BD5LlDXNBNkdcEqhrI+ 7tqMAYSMb9OvMw6nLOCAzCFECxN4p2gOb+aIPEumYd1PJDT9hC/b3q64i/Zj+gUstWZLNspb1gz r73VgqdXtq/joSKcD3ZgEIfjDzRdJ2ikzMVmTBNgvAjqUnMdl+04CwJd4sRp9mK0= X-Received: by 2002:a17:902:581:: with SMTP id f1-v6mr3314725plf.48.1527086705402; Wed, 23 May 2018 07:45:05 -0700 (PDT) X-Google-Smtp-Source: AB8JxZpZPesxzyWajaWyMfUwStKuf+1ijWUvv9BXMERw2JEUq68joehU5kdeCquuqElRpNoXu8vo X-Received: by 2002:a17:902:581:: with SMTP id f1-v6mr3314685plf.48.1527086704630; Wed, 23 May 2018 07:45:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527086704; cv=none; d=google.com; s=arc-20160816; b=hDbmHRLEQiOX/sWeGPn6gCd7/i9auVMWZ1CmsuokDPxQg5hCWyiKWgGbFOSikiGopU SpdLKfHcY92w9Ebbkp88GMFKPhlqIa++At1njR7s8mmMG9gExe86yyadC+7Xi3xbeV9u FnNRHKsjEVTxpTyt3C/BBoddyDTZb/Ew4z4BZkPBLNh7B0cN0BauFyPBUYJpznNpYI4r j9UbyuEM1DGDsmy4fuXFhOMGTYiFg2ZrrEde8EF28hKEqMLL0R6l2TYEViLISahf1naz o1kOncRYgaIOIGVsU2IXZzHeCoOxxtJo1jTo1uhCR1rpScXIREMrLWEPQ2VujQc/LXKS cTGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=XKlSObd5waaEUrM9cGkfFRJm5yomFl51q7JbAkunFFQ=; b=lY6Ubptwi/8Z1soo+6MVjT53EyFX1N845Uj8N0zrVjpoJu1DERtyVl79zYbK8dVi+P edRu2QjSR0BS3GKRrtNgca41e+4JF02vJ5eWkntgEMzQRMr/7SSVdvvdoul7dBZt+3ch vkf3GqFhExk/IKE9gr0J4JGtr/zP5vNfSKjyiSubWrfSxg4sJDFI360+VihFwmv7yWBv df8jc7ka0p7b9jxZfjA5ehC3eGua++7uridzE6wAcVSkISjdFtwQnYlllcVddv0oXfty N4SnOWpRWirSGKK0Qy7gHSxeFZm/JOgNXIsSZONiCSG3EGkKIFlhAc2NQ5MUI28alxQV X1kw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=QhfBEou4; spf=pass (google.com: best guess record for domain of batv+df5a2477ff0fa86e9985+5386+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+df5a2477ff0fa86e9985+5386+infradead.org+hch@bombadil.srs.infradead.org Received: from bombadil.infradead.org (bombadil.infradead.org. [2607:7c80:54:e::133]) by mx.google.com with ESMTPS id c21-v6si1933910plz.190.2018.05.23.07.45.04 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 23 May 2018 07:45:04 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of batv+df5a2477ff0fa86e9985+5386+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) client-ip=2607:7c80:54:e::133; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=QhfBEou4; spf=pass (google.com: best guess record for domain of batv+df5a2477ff0fa86e9985+5386+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+df5a2477ff0fa86e9985+5386+infradead.org+hch@bombadil.srs.infradead.org 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=XKlSObd5waaEUrM9cGkfFRJm5yomFl51q7JbAkunFFQ=; b=QhfBEou4j/Cn++qlX8GrUyH4R EjWMVujvUJLIGYFrh6dSixWICppqkYLfkutT46/803syr84/WjbhnW6aC00/2qsZOPKMMiGY0KE/o OvgdtlFH4l5YBI6piVellmz4uq7US7C/T7aC6AZzcCpVXu6nJEiY9slwntLqFDKJDYXCvVw3FyDJY FZp3A66axk6i4DtgC2mG9JshvjPUo8svYOvF+5PiKidP0Ugilju8v6L6DDHzb9LeK6DZIBfEWsl2D UvAv2V5LzOQnxkRvCCwWdCaAjZTIUP/iZiaG+JW60Cu/N13Ca7r8ko3BQiq0JGPm1knKohTqgafFi DuXjxLqUw==; Received: from 089144199016.atnat0008.highway.a1.net ([89.144.199.16] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1fLV0d-0000XH-0J; Wed, 23 May 2018 14:44:59 +0000 From: Christoph Hellwig To: linux-xfs@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 19/34] xfs: simplify xfs_bmap_punch_delalloc_range Date: Wed, 23 May 2018 16:43:42 +0200 Message-Id: <20180523144357.18985-20-hch@lst.de> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180523144357.18985-1-hch@lst.de> References: <20180523144357.18985-1-hch@lst.de> X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP Instead of using xfs_bmapi_read to find delalloc extents and then punch them out using xfs_bunmapi, opencode the loop to iterate over the extents and call xfs_bmap_del_extent_delay directly. This both simplifies the code and reduces the number of extent tree lookups required. Signed-off-by: Christoph Hellwig --- fs/xfs/xfs_bmap_util.c | 78 ++++++++++++++---------------------------- 1 file changed, 25 insertions(+), 53 deletions(-) diff --git a/fs/xfs/xfs_bmap_util.c b/fs/xfs/xfs_bmap_util.c index 06badcbadeb4..c009bdf9fdce 100644 --- a/fs/xfs/xfs_bmap_util.c +++ b/fs/xfs/xfs_bmap_util.c @@ -695,12 +695,10 @@ xfs_getbmap( } /* - * dead simple method of punching delalyed allocation blocks from a range in - * the inode. Walks a block at a time so will be slow, but is only executed in - * rare error cases so the overhead is not critical. This will always punch out - * both the start and end blocks, even if the ranges only partially overlap - * them, so it is up to the caller to ensure that partial blocks are not - * passed in. + * Dead simple method of punching delalyed allocation blocks from a range in + * the inode. This will always punch out both the start and end blocks, even + * if the ranges only partially overlap them, so it is up to the caller to + * ensure that partial blocks are not passed in. */ int xfs_bmap_punch_delalloc_range( @@ -708,63 +706,37 @@ xfs_bmap_punch_delalloc_range( xfs_fileoff_t start_fsb, xfs_fileoff_t length) { - xfs_fileoff_t remaining = length; + struct xfs_ifork *ifp = &ip->i_df; + struct xfs_bmbt_irec got, del; + struct xfs_iext_cursor icur; int error = 0; ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL)); - do { - int done; - xfs_bmbt_irec_t imap; - int nimaps = 1; - xfs_fsblock_t firstblock; - struct xfs_defer_ops dfops; + if (!(ifp->if_flags & XFS_IFEXTENTS)) { + error = xfs_iread_extents(NULL, ip, XFS_DATA_FORK); + if (error) + return error; + } - /* - * Map the range first and check that it is a delalloc extent - * before trying to unmap the range. Otherwise we will be - * trying to remove a real extent (which requires a - * transaction) or a hole, which is probably a bad idea... - */ - error = xfs_bmapi_read(ip, start_fsb, 1, &imap, &nimaps, - XFS_BMAPI_ENTIRE); + if (!xfs_iext_lookup_extent(ip, ifp, start_fsb, &icur, &got)) + return 0; - if (error) { - /* something screwed, just bail */ - if (!XFS_FORCED_SHUTDOWN(ip->i_mount)) { - xfs_alert(ip->i_mount, - "Failed delalloc mapping lookup ino %lld fsb %lld.", - ip->i_ino, start_fsb); - } + do { + if (got.br_startoff >= start_fsb + length) break; - } - if (!nimaps) { - /* nothing there */ - goto next_block; - } - if (imap.br_startblock != DELAYSTARTBLOCK) { - /* been converted, ignore */ - goto next_block; - } - WARN_ON(imap.br_blockcount == 0); + if (!isnullstartblock(got.br_startblock)) + continue; - /* - * Note: while we initialise the firstblock/dfops pair, they - * should never be used because blocks should never be - * allocated or freed for a delalloc extent and hence we need - * don't cancel or finish them after the xfs_bunmapi() call. - */ - xfs_defer_init(&dfops, &firstblock); - error = xfs_bunmapi(NULL, ip, start_fsb, 1, 0, 1, &firstblock, - &dfops, &done); + del = got; + xfs_trim_extent(&del, start_fsb, length); + error = xfs_bmap_del_extent_delay(ip, XFS_DATA_FORK, &icur, + &got, &del); if (error) break; - - ASSERT(!xfs_defer_has_unfinished_work(&dfops)); -next_block: - start_fsb++; - remaining--; - } while(remaining > 0); + if (!xfs_iext_get_extent(ifp, &icur, &got)) + break; + } while (xfs_iext_next_extent(ifp, &icur, &got)); return error; }