From patchwork Fri May 18 16:48:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10411311 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 265BC6031B for ; Fri, 18 May 2018 16:49:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 15DB828619 for ; Fri, 18 May 2018 16:49:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0AB2B288BD; Fri, 18 May 2018 16:49:46 +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=ham 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 7BE9228619 for ; Fri, 18 May 2018 16:49:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7D5CE6B061A; Fri, 18 May 2018 12:49:30 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 706736B061B; Fri, 18 May 2018 12:49:30 -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 585A06B061C; Fri, 18 May 2018 12:49:30 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf0-f200.google.com (mail-pf0-f200.google.com [209.85.192.200]) by kanga.kvack.org (Postfix) with ESMTP id 108946B061A for ; Fri, 18 May 2018 12:49:30 -0400 (EDT) Received: by mail-pf0-f200.google.com with SMTP id g1-v6so5050574pfh.19 for ; Fri, 18 May 2018 09:49:30 -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=hOYc26pNxbiRoA4pnfMUvMR7uKpIuI7aZyOnNNlWPnJL/aw/G9NO32ACkQlfJsrTC3 gkjEJZBO1+sndEuHrNwnjnLr5lUhWnefl6bBWuCkYWfpmIwmANl1E7GyYnWTb4TP4JnU 9orYvHVssILTJ5V2urkTEEW6mmvpvqVLoMLHkqaANuU7BZDui8UIWnNNPkYP/4nkbfgj dywd5WE6lLoCe/OC+C+TNmBMcjrT9Xs5zckCYekV21o4mpuYs6VdoObBBgI7iixVP1AG 6iUmiK8CgvOA72tk7NBw4JCisYA6a2qO5wR2f8JY/7lsU6RxJ9siq70sgXQtnVHDXYlq TgpA== X-Gm-Message-State: ALKqPwdYW+0TjTgLJCxcF33sOQc0ZtyQ+ycgqjKrX/vHrhXWEHVY0QBh nb7xJzgRUOs/GHxhAf2w9y3NG7hwiKLB+S1qxxNfdeTPV17yKaJsMXrhtEnKmWw2azJ7loQ4Mh/ Q+S4hs9g6Vffr3dgkN89fJjmPut3/rmTR2ggqzVmac14qv/ZhAK+wdtad1/KDQ3w= X-Received: by 2002:a62:cca:: with SMTP id 71-v6mr10097576pfm.61.1526662169744; Fri, 18 May 2018 09:49:29 -0700 (PDT) X-Google-Smtp-Source: AB8JxZo+fpk/EpUseCd6L5PWAycXVghwaKcG4f3OWXMYiWrMcaACSGQ8iM1tuVZni/n4SuGzF/pE X-Received: by 2002:a62:cca:: with SMTP id 71-v6mr10097546pfm.61.1526662168951; Fri, 18 May 2018 09:49:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526662168; cv=none; d=google.com; s=arc-20160816; b=Sj1WVn11CEZeNcKgaNDGqxu5WACFq/RHn+Q1BatYWlTD75LyHig6Yie9O3pgqpBq6K UjlZVF855g9gR3NANQ8Nxg5X8/586aNcgp9sQNSyRAK/LL/z3tCtsh6lAiFmeHslEt41 952/HxJmPGESyvAxTIQjDJUcy0W6flKUaEBJo/Uepd8pyHSfjMdYyKn6WJw0CAOwKr0T PiuAfa4bIdIgx4xGEp6MuayLf56OEkOsFIv9FeUafJ1KaxCWsYnPBxgBx/JsfDlutIu0 QdP/h/xFRc+k9VEjKFrv5ivxSTynmP0ESMNkHXA8Nu3csuoFAin4gpNeyThAF7L0Rk55 QBQA== 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=C5Ws0nuEHqRU0jrY3TdbQDVtSLSZiqfho9K6z3RYMjULYjERVgYaOroiziMYdyGucp SqN4HuGloRosLPjjPWCJy4e92Od1AEeubFHqCb+WjBTJ7AzAkwJ4OrFoyE6S5mwGEc/m O5eroQwn0zba+WCQwNMKR+aOtZ5lNWcRFkfNjcCKTO+XuLDEKxiwoto6I5jxaguSfE86 9vnLFUPqNR/KU7j5SOOZo+xWaTI39cGKNkSV74kocjJ86AkHKrsetkqUCODM3EZ9Vf7V FXnsY+6NZD2pAQ+3dxbrn6VhyiMvNgQU1dQ48o9O5c8T/Fo1oNpZ9k/RZuBrW65h4bCg 5QEg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=FCdA237i; spf=pass (google.com: best guess record for domain of batv+77ddf8e9b1b344f28472+5381+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+77ddf8e9b1b344f28472+5381+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 b79-v6si7967862pfm.104.2018.05.18.09.49.28 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 18 May 2018 09:49:28 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of batv+77ddf8e9b1b344f28472+5381+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=FCdA237i; spf=pass (google.com: best guess record for domain of batv+77ddf8e9b1b344f28472+5381+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+77ddf8e9b1b344f28472+5381+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=FCdA237iGr5AY+6fbthGl7tic AsFlas8Ge40JzniOPzqlx3V8MbzAC2jSVwrL4MadOVZV0kiZpSjVpy5ZJWlGkD/njnNFirrxwT2UC Eenq7Tr4N2y1ZpFzElXoQyc14L7+cHIrrhx58WGVnQ941bOdrVnbw1G1GNat+OBTjAAfWns7btTLD d7YzIDdW2UjEwl2ytxcVMh+Ht/TuCG4xqiqXHrpOql4PGUsrJK1nk7hOoo3k7zDElsaO6G+YAe3PX LtHw9ZLNTLaA0fCzqA7MOTWgOLVPDyb4EWeRklwFlVROiGcP1G5QC3SwXgFyC5Z7k7puWtr4u1sSo q1Mp6EGNQ==; Received: from 80-109-164-210.cable.dynamic.surfer.at ([80.109.164.210] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1fJiZM-0006dY-3P; Fri, 18 May 2018 16:49:28 +0000 From: Christoph Hellwig To: linux-xfs@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org, linux-block@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 19/34] xfs: simplify xfs_bmap_punch_delalloc_range Date: Fri, 18 May 2018 18:48:15 +0200 Message-Id: <20180518164830.1552-20-hch@lst.de> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180518164830.1552-1-hch@lst.de> References: <20180518164830.1552-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; }