From patchwork Wed May 9 07:48:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10388385 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 45BBA60540 for ; Wed, 9 May 2018 07:49:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3908728E05 for ; Wed, 9 May 2018 07:49:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2DFD928E2B; Wed, 9 May 2018 07:49:31 +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 AF63828E08 for ; Wed, 9 May 2018 07:49:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 780E16B0355; Wed, 9 May 2018 03:49:25 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 56D876B0358; Wed, 9 May 2018 03:49:25 -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 3BB396B0359; Wed, 9 May 2018 03:49:25 -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 BB6D86B0355 for ; Wed, 9 May 2018 03:49:24 -0400 (EDT) Received: by mail-pf0-f200.google.com with SMTP id e16so1029056pfn.5 for ; Wed, 09 May 2018 00:49:24 -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=FSKdPjqt7K59RqiIdadsOlbJ2mMoNkEajTdM99mdb04=; b=H2I8+K/nsJ7W44wosgVeOgGm/7M72hwEenA7bTdlvVq4WqHupxJ0zLfEGamTSaOL0i wrlA1qFDqbqzokIYIS6WLQ6IPd0u8BDwC1kLCrOK45K5VU3AN4osNxYewujROgFhKAnA meQWY2uHVHuXiK3MmUMWLE2vd0oIfqIUVSGQiAao+Siv93NuR5P32iFV/b1iE7iK4Twi d/dlpc/xnVjxX1A7xS/u9av2vOhFHXNAyybbOwNKdvwFXNIRQY5lJR0FZetcL3twf0+5 XubeSzWwWR7m9G7ph2y3fyeFh6ND9CUtDMbchE4YlGxrJ2GVepn1PC6ao6GyHVTI09G7 uXxQ== X-Gm-Message-State: ALQs6tB/AUrrHmkD7HV33YJibzvPYUq7qmPJT30o5lwK+MoUpXoqZ5Jq Qeej9nU/GoS4h2d3NaYZReuCaEZGqkun7AMVNXWgwk456GpLqtCHEPcxrzSTV6hnCm9ZSIfWppY 1N6KLwpr9QLdbe/tWyp3icnz9vGe2BDBgjnFOMYVllfLmzLC7wmxCD2aVgxtQVlI= X-Received: by 2002:a63:6887:: with SMTP id d129-v6mr35823079pgc.128.1525852164419; Wed, 09 May 2018 00:49:24 -0700 (PDT) X-Google-Smtp-Source: AB8JxZryT65mzaztWCm/JbIQ+vG/yjJysjISXhKfZir3kRdL48NW7iQmRsn2y/fuvq+7QsMuC2yr X-Received: by 2002:a63:6887:: with SMTP id d129-v6mr35823043pgc.128.1525852163577; Wed, 09 May 2018 00:49:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525852163; cv=none; d=google.com; s=arc-20160816; b=QOhfMHrVG0LkkbjNA4mq3ZbueoUwMLVtKEU6ALHXOJZTNg7uSUF+bAQrwfuHu+t+Os A51oNbPYKR0uudFX17jZkTqeowOquBQtS5if8lVMQC6PpR1DTeES+OXvC3boBbSsxW7P lHlUXYowVW4lad2cKWWEEOBiPOTNfHVWXYEfN72jnwhYV+m5jd94kuAkwC5LQbsFpdys 9mLU2jA/8E3tQyjlR9aJbV8uBimYnZUGRVOV2qgwui9N8yUQ5aTNIJka0qu6efTArFcr p8DNDotAQEwQBxxmevrLbbBLddRQhAnigPDqgVG/TVh8PoACMX9DqwNiwHGLnIq4YB6I fUZQ== 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=FSKdPjqt7K59RqiIdadsOlbJ2mMoNkEajTdM99mdb04=; b=aHUpFqSbvDLKVVN6lGuhE61EU/dqO/Sh0Ahev7EWSCENPx3XITgNrZXoRuBED29QQu uu4hA8LugDyQt0SdDAVjq+8wkLLJMzyppdwAwDX2YZDHhl4ScckdmF6fNYSmEegyAf4s vCLbkX6EyeVAoOG/+I+5GHwDJLG+huCVlZ5Jlxil1VL4iW+bVIrUbHuBa1TI9qoxsBJU wTe6DSpI3Azm7H2DKKxJ2WbEO+urbGPc2XwxSc3uQPZ0UJ43EtyzhW5YSZJlgD8zO0xI KgUgaq6As2AXYqCveOWf0leblaY+8x7Xx5/K5fW5YXKLbwbYpgLhO6P8KHD3AuW0VhYg IVHA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=DOBpCwt0; spf=pass (google.com: best guess record for domain of batv+e0efdd19ce80d487e3da+5372+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+e0efdd19ce80d487e3da+5372+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 i6-v6si20717035pgs.637.2018.05.09.00.49.23 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 May 2018 00:49:23 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of batv+e0efdd19ce80d487e3da+5372+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=DOBpCwt0; spf=pass (google.com: best guess record for domain of batv+e0efdd19ce80d487e3da+5372+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+e0efdd19ce80d487e3da+5372+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=FSKdPjqt7K59RqiIdadsOlbJ2mMoNkEajTdM99mdb04=; b=DOBpCwt0aVRnEYyLL5emwLzGL 3CIaVTlNMFDbrAMLYcFfhKxCbMUoFSAdgtNUKLJVCFSCGqgsK/Q/AQCMpGvuGOyNljz0r4Qf1mSzd WVG0/RvD2Ui1i9Ja9uFp/dWMCt0h3Es569NFCir+tIKkhHq88Dc+u+7AcFj0MD0OI+M18PUNx0LSM /XaNtPJAVavyzhTFKaMV21nLauGdJ2N4LhjUXFiK4G0cv4PoxT8msCbmHRx96U7H70UFOLFKBVqMx rnZp3sCdenMAtDl6U07E4lLCO0T1d4ygPqyeBSFWo3JxKvLy1eHqQYSYxG1eJbj72S1xmkfgEEcUy WkjYdq4Xw==; Received: from 213-225-15-246.nat.highway.a1.net ([213.225.15.246] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1fGJqk-0001Yl-1M; Wed, 09 May 2018 07:49:22 +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 14/33] xfs: simplify xfs_bmap_punch_delalloc_range Date: Wed, 9 May 2018 09:48:11 +0200 Message-Id: <20180509074830.16196-15-hch@lst.de> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180509074830.16196-1-hch@lst.de> References: <20180509074830.16196-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 8cd8c412f52d..7d2ba4cc8fba 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; }