From patchwork Mon Sep 18 15:24:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 9956919 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 58761601E9 for ; Mon, 18 Sep 2017 15:24:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4965128A9B for ; Mon, 18 Sep 2017 15:24:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3E7C528B18; Mon, 18 Sep 2017 15:24:33 +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 B62AA28A9B for ; Mon, 18 Sep 2017 15:24:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752810AbdIRPYa (ORCPT ); Mon, 18 Sep 2017 11:24:30 -0400 Received: from bombadil.infradead.org ([65.50.211.133]:60043 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752668AbdIRPY1 (ORCPT ); Mon, 18 Sep 2017 11:24:27 -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:To:From:Sender:Reply-To:Cc: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=gYTxsd5pE3NsbPAHXvLft8xg3XR+eeTkmXxkPdss2TA=; b=chqb1N5mX0Y6SxoLa10lJsv4T 5mjvcBwh91QVIEKhYJX7B7VufXc1Xs33S1bhYZVKCkojknFKiXhWXbwG6F493iAj0EfzYgfMZb78D XBTbeFqGUv4sI2Gbnjv8Ye/dEr7rJFqH0clET+WVXPJ/2tpZ1LM9xFe26RDxE0vZQjouP/fru7P1R OJaYb/RQgIQYqOS+xssf/lajlIOLjNoU7XIpnjcuOdJUqzAb08PGVZj7i7mv9ZR4eABUY8vNBiC2w UgEJc+P3Jpik/giNxu+GBHhHVjwct/2dFgBM/UQHd7gyLPoVpqSLdayBbp8UVz1X3d2JgmP8Mbo7i NLMdrp7qg==; Received: from [107.17.164.65] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.87 #1 (Red Hat Linux)) id 1dtxuN-0005E5-Jy for linux-xfs@vger.kernel.org; Mon, 18 Sep 2017 15:24:27 +0000 From: Christoph Hellwig To: linux-xfs@vger.kernel.org Subject: [PATCH 09/19] xfs: refactor xfs_del_extent_real Date: Mon, 18 Sep 2017 08:24:12 -0700 Message-Id: <20170918152422.24345-10-hch@lst.de> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170918152422.24345-1-hch@lst.de> References: <20170918152422.24345-1-hch@lst.de> X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html 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 Use xfs_iext_update_extent to update entries in the in-core extent list. This isolates the function from the detailed layout of the extent list, and generally makes the code a lot more readable. Signed-off-by: Christoph Hellwig Reviewed-by: Brian Foster Reviewed-by: Darrick J. Wong --- fs/xfs/libxfs/xfs_bmap.c | 60 ++++++++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c index 037efc97499f..bd00f4d135af 100644 --- a/fs/xfs/libxfs/xfs_bmap.c +++ b/fs/xfs/libxfs/xfs_bmap.c @@ -5078,10 +5078,9 @@ xfs_bmap_del_extent_real( xfs_fsblock_t del_endblock=0; /* first block past del */ xfs_fileoff_t del_endoff; /* first offset past del */ int do_fx; /* free extent at end of routine */ - xfs_bmbt_rec_host_t *ep; /* current extent entry pointer */ int error; /* error return value */ int flags = 0;/* inode logging flags */ - xfs_bmbt_irec_t got; /* current extent entry */ + struct xfs_bmbt_irec got; /* current extent entry */ xfs_fileoff_t got_endoff; /* first offset past got */ int i; /* temp state */ xfs_ifork_t *ifp; /* inode fork pointer */ @@ -5090,9 +5089,8 @@ xfs_bmap_del_extent_real( xfs_bmbt_irec_t new; /* new record to be inserted */ /* REFERENCED */ uint qfield; /* quota field to update */ - xfs_filblks_t temp; /* for indirect length calculations */ - xfs_filblks_t temp2; /* for indirect length calculations */ int state = 0; + struct xfs_bmbt_irec old; mp = ip->i_mount; XFS_STATS_INC(mp, xs_del_exlist); @@ -5105,8 +5103,7 @@ xfs_bmap_del_extent_real( ifp = XFS_IFORK_PTR(ip, whichfork); ASSERT((*idx >= 0) && (*idx < xfs_iext_count(ifp))); ASSERT(del->br_blockcount > 0); - ep = xfs_iext_get_ext(ifp, *idx); - xfs_bmbt_get_all(ep, &got); + xfs_iext_get_extent(ifp, *idx, &got); ASSERT(got.br_startoff <= del->br_startoff); del_endoff = del->br_startoff + del->br_blockcount; got_endoff = got.br_startoff + got.br_blockcount; @@ -5193,54 +5190,56 @@ xfs_bmap_del_extent_real( * Deleting the first part of the extent. */ trace_xfs_bmap_pre_update(ip, *idx, state, _THIS_IP_); - xfs_bmbt_set_startoff(ep, del_endoff); - temp = got.br_blockcount - del->br_blockcount; - xfs_bmbt_set_blockcount(ep, temp); - xfs_bmbt_set_startblock(ep, del_endblock); + got.br_startoff = del_endoff; + got.br_startblock = del_endblock; + got.br_blockcount -= del->br_blockcount; + xfs_iext_update_extent(ifp, *idx, &got); trace_xfs_bmap_post_update(ip, *idx, state, _THIS_IP_); if (!cur) { flags |= xfs_ilog_fext(whichfork); break; } - if ((error = xfs_bmbt_update(cur, del_endoff, del_endblock, - got.br_blockcount - del->br_blockcount, - got.br_state))) + error = xfs_bmbt_update(cur, got.br_startoff, got.br_startblock, + got.br_blockcount, got.br_state); + if (error) goto done; break; case BMAP_RIGHT_FILLING: /* * Deleting the last part of the extent. */ - temp = got.br_blockcount - del->br_blockcount; trace_xfs_bmap_pre_update(ip, *idx, state, _THIS_IP_); - xfs_bmbt_set_blockcount(ep, temp); + got.br_blockcount -= del->br_blockcount; + xfs_iext_update_extent(ifp, *idx, &got); trace_xfs_bmap_post_update(ip, *idx, state, _THIS_IP_); if (!cur) { flags |= xfs_ilog_fext(whichfork); break; } - if ((error = xfs_bmbt_update(cur, got.br_startoff, - got.br_startblock, - got.br_blockcount - del->br_blockcount, - got.br_state))) + error = xfs_bmbt_update(cur, got.br_startoff, got.br_startblock, + got.br_blockcount, got.br_state); + if (error) goto done; break; case 0: /* * Deleting the middle of the extent. */ - temp = del->br_startoff - got.br_startoff; trace_xfs_bmap_pre_update(ip, *idx, state, _THIS_IP_); - xfs_bmbt_set_blockcount(ep, temp); + + old = got; + got.br_blockcount = del->br_startoff - got.br_startoff; + xfs_iext_update_extent(ifp, *idx, &got); + new.br_startoff = del_endoff; - temp2 = got_endoff - del_endoff; - new.br_blockcount = temp2; + new.br_blockcount = got_endoff - del_endoff; new.br_state = got.br_state; new.br_startblock = del_endblock; + flags |= XFS_ILOG_CORE; if (cur) { error = xfs_bmbt_update(cur, got.br_startoff, - got.br_startblock, temp, + got.br_startblock, got.br_blockcount, got.br_state); if (error) goto done; @@ -5262,7 +5261,8 @@ xfs_bmap_del_extent_real( * insert operation. */ error = xfs_bmbt_lookup_eq(cur, got.br_startoff, - got.br_startblock, temp, &i); + got.br_startblock, + got.br_blockcount, &i); if (error) goto done; XFS_WANT_CORRUPTED_GOTO(mp, i == 1, done); @@ -5270,17 +5270,17 @@ xfs_bmap_del_extent_real( * Update the btree record back * to the original value. */ - error = xfs_bmbt_update(cur, got.br_startoff, - got.br_startblock, - got.br_blockcount, - got.br_state); + error = xfs_bmbt_update(cur, old.br_startoff, + old.br_startblock, + old.br_blockcount, + old.br_state); if (error) goto done; /* * Reset the extent record back * to the original value. */ - xfs_bmbt_set_blockcount(ep, got.br_blockcount); + xfs_iext_update_extent(ifp, *idx, &old); flags = 0; error = -ENOSPC; goto done;