From patchwork Wed May 30 09:59:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10438209 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 6CCE4601E9 for ; Wed, 30 May 2018 10:00:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5D26E288B7 for ; Wed, 30 May 2018 10:00:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 51DD2288ED; Wed, 30 May 2018 10:00:39 +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 D49FF288B7 for ; Wed, 30 May 2018 10:00:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CDC306B027B; Wed, 30 May 2018 06:00:35 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id C8B276B027C; Wed, 30 May 2018 06:00:35 -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 B7AAC6B027D; Wed, 30 May 2018 06:00:35 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf0-f198.google.com (mail-pf0-f198.google.com [209.85.192.198]) by kanga.kvack.org (Postfix) with ESMTP id 7631D6B027B for ; Wed, 30 May 2018 06:00:35 -0400 (EDT) Received: by mail-pf0-f198.google.com with SMTP id l85-v6so10572452pfb.18 for ; Wed, 30 May 2018 03:00:35 -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=avFua37WPhJghWqcgLbG4I2pdGZUZvMvFrPHADh4oHE=; b=W8yC/nvozTb1ivJFLaU7Q71kjIr6DKTmt8ct2l913yGMUtKmusQwrcinvi5eTymAIl EDUrT1Y5DHYi7dJGHQUhC2tquluDzb0feMycUDt7tq32b2teCsoAGOQ9BhQ7Vuu0uRXq Uu5b5QurDBD8HUzMbfzZvTLcz3aibCrUNN80Yn7QMDHYGaFWkD40ffH3Vljeqnxe3YrA ri1dU5RAcX6AcvZbzahvJoEQcPo2zEuBM/4JwvOdc74XkgdoL7ufAT9cXzjlV08XiuQC 8M93jq2AA7RKtytz/V9iIzVbVjWjDuAbtGmJsiu+XPqpwfLtX5Hpq/nysGRt2KPtdemF lltA== X-Gm-Message-State: ALKqPwecLQN2xioTVNSilpVRRumepeQGs3BR+klApICyB1i6Pp0Ke2+m h0i0BsU2aeIPoKVXLdPX5FigkUSZZQ4s9a+OX3Ltt2edtWebX69lXE85cAZOic49HHx1kLJz61a gykqVxwEA+OjKqTWReuJsRO8Rjt/bKLz6oLbh/+O4N4ZAZT0EXFeesWJv2+6hNMQ= X-Received: by 2002:a62:3c15:: with SMTP id j21-v6mr2142627pfa.7.1527674435173; Wed, 30 May 2018 03:00:35 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLzKBXRHpWp38Ga5Fl7jGpfwaSO/gU9Z61h2pwdryfl8xm4BJfwFPlZl7fDckwpzpKk4Zsx X-Received: by 2002:a62:3c15:: with SMTP id j21-v6mr2142539pfa.7.1527674434080; Wed, 30 May 2018 03:00:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527674434; cv=none; d=google.com; s=arc-20160816; b=E1UOJvnvNlXu6m8sfUUlwFs6yo2jUr1QBjbv9q0/vsVgGGQUnjZ0SvLTaAp6F6O9mf 4cYlvPWUpQp3hl1ukaidBOVWdDOkLh1iSXa0mZjkF+8zIH9sSdCpgpDaiEo5EtZvxanO Vl8MFMQHiFznWQRjvGAj5kgQuCGdtksvF6hSv4XHJQink+2rFj7os/vic8h9WxF0WYuk WY5mAprRWMuUuK4ApU+s+VMBWwJRFb9IS4tJEYvK/i98PkWE86Co6XainDnaNBIpKi+a uvx6Ydgblb9vX9iEfQBMod+wcg3SjENx6rjToSQGbZ5WjEK0rY692kOyW+PqCVDfu18Q BFEQ== 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=avFua37WPhJghWqcgLbG4I2pdGZUZvMvFrPHADh4oHE=; b=ztUynKeL9WG+KNodcRMAS+6cSrUpABSPH0isgzMTx/yQP84VucYF0ft0PBDpW7ugoq bOMO9RIERzhIi09teHKY4OPbvNQf0yQrXK3KlaLazCca6remozA6cCb+V6Ui3dGsrm5S tvQkZzgf20Xsh/I7toBbYI+JqfMUz/J4cUfp3DfDY5eKcd+O73JCJY2S+eYdDTKO+qcj d4SGHc+NslakP6n/R/XGxBSApfYSdhFI3++VM815TEXoPGpe3Wwj0DxCv7jzn6K8U56C wi65xFG2b75WIi8Od59TcQjnJbvL/nMCukLx6rBSOgZEb+vvWr/i10FBbd8knKHTdrzl WEvQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=ezp6mYD8; spf=pass (google.com: best guess record for domain of batv+1f4557cc97fec8e307c5+5393+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+1f4557cc97fec8e307c5+5393+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 t29-v6si6858878pfg.114.2018.05.30.03.00.32 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 30 May 2018 03:00:33 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of batv+1f4557cc97fec8e307c5+5393+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=ezp6mYD8; spf=pass (google.com: best guess record for domain of batv+1f4557cc97fec8e307c5+5393+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+1f4557cc97fec8e307c5+5393+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=avFua37WPhJghWqcgLbG4I2pdGZUZvMvFrPHADh4oHE=; b=ezp6mYD8sJZ3u2ifeEfGsma/Z RuLeXWzkEmDso3ZK1oL/PgsKSDcyTTsj3t2ZVykB1PuXCZXWCnt38EaUKt1ObjB4QQFyXigupIMlO lf7NLu+e/15aqLmrFXfsgnMLZtbs3G+b+WLVuDSgX21p02Q9q/5q9FO9pRnsr/+dmQZupdpfjspaJ gLa9CuuZdE8SssythyAMFgSiJxrB9RDUUH7fk3PfiD+NZOZv/78N1mN8+9NZMtgT/hp2Yd73B5DwX DB8chWvqLrer5s2QLEkOdnN4DLPPfn8iWR5l5iqpkuPbroUBO1QlY8vAHtvbhtZMDkX3YWmXZz4dz N0lkt2B4w==; Received: from 213-225-38-123.nat.highway.a1.net ([213.225.38.123] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1fNxu9-0007rK-DP; Wed, 30 May 2018 10:00:30 +0000 From: Christoph Hellwig To: linux-xfs@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 03/18] xfs: simplify xfs_bmap_punch_delalloc_range Date: Wed, 30 May 2018 11:59:58 +0200 Message-Id: <20180530100013.31358-4-hch@lst.de> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180530100013.31358-1-hch@lst.de> References: <20180530100013.31358-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 | 84 ++++++++++++++---------------------------- 1 file changed, 28 insertions(+), 56 deletions(-) diff --git a/fs/xfs/xfs_bmap_util.c b/fs/xfs/xfs_bmap_util.c index 06badcbadeb4..f2b87873612d 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; + xfs_fileoff_t end_fsb = start_fsb + length; + 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; - - /* - * 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 (!(ifp->if_flags & XFS_IFEXTENTS)) { + error = xfs_iread_extents(NULL, ip, XFS_DATA_FORK); + if (error) + return error; + } - 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); - } - 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 (!xfs_iext_lookup_extent_before(ip, ifp, &end_fsb, &icur, &got)) + return 0; - /* - * 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); - if (error) - break; + while (got.br_startoff + got.br_blockcount > start_fsb) { + del = got; + xfs_trim_extent(&del, start_fsb, length); - ASSERT(!xfs_defer_has_unfinished_work(&dfops)); -next_block: - start_fsb++; - remaining--; - } while(remaining > 0); + if (del.br_blockcount && isnullstartblock(del.br_startblock)) { + error = xfs_bmap_del_extent_delay(ip, XFS_DATA_FORK, + &icur, &got, &del); + if (error || !xfs_iext_get_extent(ifp, &icur, &got)) + break; + } else { + if (!xfs_iext_prev_extent(ifp, &icur, &got)) + break; + } + } return error; }