From patchwork Wed May 23 14:43:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10421649 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 EC11360327 for ; Wed, 23 May 2018 14:46:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DD08528733 for ; Wed, 23 May 2018 14:46:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D1D8728868; Wed, 23 May 2018 14:46:12 +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 7601E28733 for ; Wed, 23 May 2018 14:46:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 851156B0283; Wed, 23 May 2018 10:45:23 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 7ACEE6B0284; Wed, 23 May 2018 10:45:23 -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 600F26B0285; Wed, 23 May 2018 10:45:23 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl0-f70.google.com (mail-pl0-f70.google.com [209.85.160.70]) by kanga.kvack.org (Postfix) with ESMTP id 14B706B0283 for ; Wed, 23 May 2018 10:45:23 -0400 (EDT) Received: by mail-pl0-f70.google.com with SMTP id bd7-v6so14344468plb.20 for ; Wed, 23 May 2018 07:45:23 -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=aJyIE2LMjzTVg275rR7Gcq4QkTn1WccF6vSeQfuL4ng=; b=eP3VPMihKi55Eb6fkEnzR/fEAIbk/hckZdSvLr1xUDfh9SHlAIJqv1FGG3Gq7rljzM 1cqVbhcCD2N8AKSoI5BI03kDVmgBPWGceD1FIPLjqPL3XjxYUYiDG3fw57eQu45lkYOx 7Gyvachacrmm8s3KtXy6jHRypI2R8ai0na12surNwspE/ex66p+ADOOOMHvVfCM1xrtH 1PHG8wwib/Z9Vyl9pvaN0/xwQrT/jPgEC7IshNTm9Lk8hV6IRKLoX08PNxPNNrm9j2+o CYwvZmqLCsrs7tL/ZJYCA1Yu43U+BG44PtBKlE3DTS84JqGe36L1kkPPEO29RgSZnoEX Kyog== X-Gm-Message-State: ALKqPwcGt17ej5qHoxqUnw5AIQw46RjXMy1sRG3Oxzb4srtBSnyBOOIS tmoU9b4JHUW7UVSB/DHS7+fsfdFpmp8BW0UxP12ztXsc+lM0BwHyEZTvh6i9TkFcMooHLsPGNZl K4x5Rt5sVGsIUvpO+1INUP8zbCkR2bmdRTKFGf4+I9uLT9jum+l+ubrw840yIIHQ= X-Received: by 2002:a62:c2:: with SMTP id 185-v6mr3209417pfa.238.1527086722788; Wed, 23 May 2018 07:45:22 -0700 (PDT) X-Google-Smtp-Source: AB8JxZpxvmXs9QafJBzxYsy7rfz2dSOZIbSriyrXX5wdkBcFreqK4Zk4k4DWDCmM77gtW2PVHX79 X-Received: by 2002:a62:c2:: with SMTP id 185-v6mr3209379pfa.238.1527086722076; Wed, 23 May 2018 07:45:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527086722; cv=none; d=google.com; s=arc-20160816; b=Dd/do0SGusshvI2tAUp8BQ0LYDuskXvhJgK1fh+klWOpTMAi+csF08W7WWgbrRv3eB qwmGtwsO74C0bjvy4zjMoj5VoQQP7aqg2iHnfrOz/Klulrar5TslkJ3DlL6nRVtpl5Pd Ebfa9TemYLX+PtYSSgHwdHHe2Awz6hvavmAz3oVgmyO4bSEdQq0GoqnEIKfvo7XuYLrE ygbIlZ/7Xut05xar3iS7EbPpJXkP4hYVGp9cScPKnnnO669a3Os2sSobcfokt108BNfq RQqB+G7KnZj1R16pquEDx2n5FnUEV/w8ctE0dDul2jcJ33FM6XsAk9vAc2izclZopf7m nFUQ== 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=aJyIE2LMjzTVg275rR7Gcq4QkTn1WccF6vSeQfuL4ng=; b=uD6lBBuHxAXF6f2cxo41Bz9IlvYR+goln8LzM8SYktkRUXzRf1bVzR9yej3HVweo1i M68y09sKleQ+RT22/WGVBAJ1A0gkzmSHRQlpQfqVlSNhqMOxgVXX7od5fK/nnJRp5KNN 0ynwtwrgTd3bVlnIlI5VhFn/G4CTrC9Z6DreS9bdI7SX60jYuzopEhKf5b9uYytATLLz s7u4fpSz7P7FWGf2IKDsMaOpTIREw8OizjR9v8ZXOM0mFy8Qq7DD4UhRPpFVwBDKkfK1 ft+N69GQ9n2jb/iVdsT+QUmne3QoNNScFweJH0Z4JXTAqwg7sqEPF27qv2ptQY+l2ZdB LEJg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=XW27Qkac; spf=pass (google.com: best guess record for domain of batv+df5a2477ff0fa86e9985+5386+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+df5a2477ff0fa86e9985+5386+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 e1-v6si15037991pgr.167.2018.05.23.07.45.21 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 23 May 2018 07:45:22 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of batv+df5a2477ff0fa86e9985+5386+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=XW27Qkac; spf=pass (google.com: best guess record for domain of batv+df5a2477ff0fa86e9985+5386+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+df5a2477ff0fa86e9985+5386+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=aJyIE2LMjzTVg275rR7Gcq4QkTn1WccF6vSeQfuL4ng=; b=XW27QkacjJyq2ZxkA09+Ky7pB dy4zB2+kIjzW+xgeuljCP3plqsRtc//7BlFH3otCWgr+38cpktzYI+K+4tilpZgC9fqfJV4cTjwu9 qSkcun4jU7czIKwe32X+mkIhTVqAPWaczpx+4yHxjySEBPp+0hdNzrJN9eZlDoH/DpTAO4R5hVDVU jB1bNmCFGHVlubnZ2hd+xSHPu3FixTOxriv48CJ70x08kOPItGoOI1LLhlwqgQq4B/UFTNuTxOyO1 PVEZd2QtN2DqDNQ5JstexaCL7WSrNJd8usdbLTLEjcycWo+XZy3xE0lFjixKLLgFN8RQ41Dlo9TgG rnkXtvehA==; Received: from 089144199016.atnat0008.highway.a1.net ([89.144.199.16] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1fLV0y-0001Ff-V0; Wed, 23 May 2018 14:45:21 +0000 From: Christoph Hellwig To: linux-xfs@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 26/34] xfs: simplify xfs_map_blocks by using xfs_iext_lookup_extent directly Date: Wed, 23 May 2018 16:43:49 +0200 Message-Id: <20180523144357.18985-27-hch@lst.de> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180523144357.18985-1-hch@lst.de> References: <20180523144357.18985-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. Signed-off-by: Christoph Hellwig --- 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 354d26d66c12..b1dee2171194 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; bool cow_valid = false; if (XFS_FORCED_SHUTDOWN(mp)) @@ -432,24 +431,16 @@ xfs_map_blocks( goto done; } - 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 */ *type = XFS_IO_DELALLOC;