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: 10438277 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 1E0DF603D7 for ; Wed, 30 May 2018 10:01:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0EFBF288ED for ; Wed, 30 May 2018 10:01:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 03C29288F1; Wed, 30 May 2018 10:01:34 +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 21359288EF for ; Wed, 30 May 2018 10:01:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 193D76B0284; Wed, 30 May 2018 06:01:03 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 142D76B0285; Wed, 30 May 2018 06:01:03 -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 031CF6B0286; Wed, 30 May 2018 06:01:02 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf0-f197.google.com (mail-pf0-f197.google.com [209.85.192.197]) by kanga.kvack.org (Postfix) with ESMTP id B38936B0284 for ; Wed, 30 May 2018 06:01:02 -0400 (EDT) Received: by mail-pf0-f197.google.com with SMTP id q15-v6so10613278pff.17 for ; Wed, 30 May 2018 03:01:02 -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=D4cVVw8cw5WpGW+NaR4oHkiZzquUiHE6e+TuwLha97k=; b=sCWvZ9+5/631pdltINnd32ruYXeF6A/cDks+InhSOZ9JNImGBu6NO155dkHvXyFPES vgOnn3Nvr4HGXuF25xpCKerMqb8Bi8iZPrRkfBtiBgD++ppXWYBPtbwBjnQWBdVJMZDW +HBvZ7sQQsPYmk3cCSLNfTxKdwI9srKbwaeFrx/lS6QWSAW3QS/tfIKJA4ld3TlEa+bT dEanC5lWzv8tVvSWQuANGXusdZohciXHvhlExGnaOtIRWDhLw4xrV8pDhQh5AjhQAhLl IbNwKsWbH5ggHhd0cFvpadcNE2FPIuVpsx9E1hI+l4FqCC++mrtdL31Us6OgJ07DcYZV ohQw== X-Gm-Message-State: ALKqPwczjh9eGXh7n24mm6XEn3GKDmVXFqUDorZcbpx+fdrjDrxCk52s tE/DaD4SBfTrOgJEwphuxUvuCRTo+2Wn1VZIfbFgg6cD7pNNULxxFzpy7Qw3one8NGRDtcmQktU zUMBk69hgoiYAdg2ExhAvLXBhNuMfUPyibdivUEF/kdjBhKEitG2S7NTuwMLBTII= X-Received: by 2002:a63:56:: with SMTP id 83-v6mr1650667pga.29.1527674462393; Wed, 30 May 2018 03:01:02 -0700 (PDT) X-Google-Smtp-Source: ADUXVKL2wyBhZsgafYCRw4bwopEJE104uTlelVYI5j7zNzTTgVTyntciet1HUlChBqa057DG5/J7 X-Received: by 2002:a63:56:: with SMTP id 83-v6mr1650606pga.29.1527674461623; Wed, 30 May 2018 03:01:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527674461; cv=none; d=google.com; s=arc-20160816; b=nqEbvx3Fy6rdcYYaScT7AfUiR1faWDzrd0b8qkjde44V2O4SLk/8oMvXoW+/NDURaj vhuF1hKy8wcBnZFpz+MsTzgnalqRhL7vqgtrFJKVTZdlYPla50GdNwpY0ArrjN1dKCET Gy1Wn+r39gs+9AbUa2OGcd1t318IYNDfaEWbY1KpvZ1L6si1/WxfAIulbDxsPD08KhwA 69v2vJ4zT7hI8nKv7ra/MmaVsP5NCzTezbeOTt6vEiwuz3O0ic1M9Bx98dkWrn5c5GCE 1Rq+/J+xnC7VHByqmYCDsZZ90oPWTLDfsraFtsCrxhHOJEL/jae07/dl3mhkdMT+ap9X qNCw== 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=D4cVVw8cw5WpGW+NaR4oHkiZzquUiHE6e+TuwLha97k=; b=KUIzP7U61EvqkiKqibfr4sjK3zNVVzR2zrRBgdZZsgL0NJrNj6EIaibPU33BkYbA+s agIw9ENIVd42OAMrh/IcA6EQTdb0mJcB3CTqI/ACuZRxP/AFHiPRngybILwi0gmcYR7R s25BoYSp8b0pl58n4zGVWsALY7KZwVA4LLfRATnfANaOVtfaN8aFEhE1pby3zVqCUArF 3+sZ4/OrSl38LUP7OOSoCAEoNwHM/6STELMbUwouQFhrAkfuBotLl//QKZUsPBT/09hh r5Otlgsw5F+Cp6AvtfO8dm372Jnm0QCDtsdnRCECDrY1vLkB6y6BOQPk6K7jtmamYJJq Bziw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=T359b0K2; 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 f9-v6si27161605pgt.625.2018.05.30.03.01.01 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 30 May 2018 03:01:01 -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=T359b0K2; 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=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 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 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 */