From patchwork Wed May 30 10:00:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10438243 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 52242601E9 for ; Wed, 30 May 2018 10:01:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 43020288B7 for ; Wed, 30 May 2018 10:01:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3807F288EF; Wed, 30 May 2018 10:01:13 +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=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, 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 D551E288B7 for ; Wed, 30 May 2018 10:01:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751305AbeE3KBL (ORCPT ); Wed, 30 May 2018 06:01:11 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:38162 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751326AbeE3KBB (ORCPT ); Wed, 30 May 2018 06:01:01 -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: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=D4cVVw8cw5WpGW+NaR4oHkiZzquUiHE6e+TuwLha97k=; b=T359b0K2VOnI2hf8qViH+5NfD r2ypUXuTOk6UYm/BN4Yg3X+3BTpyL4tBdblODN43pcO06RxoSdmPQyurOH9VZl6sZNr1mpFfABS3G rcABx93MQhs3Aj1l6IrnU10JkivIHln3d1vCJAuPZxyUQJqJlc2LzbwIVSY0jKoHwZWRxCBJVDraa vMhTDOW2uup6hpRDa80kX8Ibqr4qZUmnEoSvzeMk+IhqePkaZX1WptVSLfjM1sKxoxyaFgL7XI97r mDnIQcCHct1yc7LoYR1oWrY4ldAE3ClXiZYvPTBuywLHgAb15PgkVKx+NnhavLjNYW1ST3XfoYP8b g/ljbDrxQ==; 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 1fNxud-0008Tg-O8; Wed, 30 May 2018 10:01:00 +0000 From: Christoph Hellwig To: linux-xfs@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 10/18] xfs: simplify xfs_map_blocks by using xfs_iext_lookup_extent directly Date: Wed, 30 May 2018 12:00:05 +0200 Message-Id: <20180530100013.31358-11-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 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 xfs_bmapi_read adds zero value in xfs_map_blocks. Replace it with a direct call to the low-level extent lookup function. Note that we now always pass a 0 length to the trace points as we ask for an unspecified len. Signed-off-by: Christoph Hellwig Reviewed-by: Darrick J. Wong Reviewed-by: Brian Foster --- fs/xfs/xfs_aops.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c index 587493e9c8a1..cef2bc3cf98b 100644 --- a/fs/xfs/xfs_aops.c +++ b/fs/xfs/xfs_aops.c @@ -387,7 +387,6 @@ xfs_map_blocks( int whichfork = XFS_DATA_FORK; struct xfs_iext_cursor icur; int error = 0; - int nimaps = 1; if (XFS_FORCED_SHUTDOWN(mp)) return -EIO; @@ -429,24 +428,16 @@ xfs_map_blocks( goto allocate_blocks; } - error = xfs_bmapi_read(ip, offset_fsb, end_fsb - offset_fsb, - imap, &nimaps, XFS_BMAPI_ENTIRE); + if (!xfs_iext_lookup_extent(ip, &ip->i_df, offset_fsb, &icur, imap)) + imap->br_startoff = end_fsb; /* fake a hole past EOF */ xfs_iunlock(ip, XFS_ILOCK_SHARED); - if (error) - return error; - if (!nimaps) { - /* - * Lookup returns no match? Beyond eof? regardless, - * return it as a hole so we don't write it - */ + if (imap->br_startoff > offset_fsb) { + /* landed in a hole or beyond EOF */ + imap->br_blockcount = imap->br_startoff - offset_fsb; imap->br_startoff = offset_fsb; - imap->br_blockcount = end_fsb - offset_fsb; imap->br_startblock = HOLESTARTBLOCK; *type = XFS_IO_HOLE; - } else if (imap->br_startblock == HOLESTARTBLOCK) { - /* landed in a hole */ - *type = XFS_IO_HOLE; } else { if (isnullstartblock(imap->br_startblock)) { /* got a delalloc extent */