From patchwork Fri May 18 16:48:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10411349 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 606EE6031B for ; Fri, 18 May 2018 16:50:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 517052844E for ; Fri, 18 May 2018 16:50:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 45E6F288BD; Fri, 18 May 2018 16:50:15 +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 BA4E32844E for ; Fri, 18 May 2018 16:50:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 92C876B062C; Fri, 18 May 2018 12:49:57 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 8B6296B062E; Fri, 18 May 2018 12:49:57 -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 7332E6B062F; Fri, 18 May 2018 12:49:57 -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 2755C6B062C for ; Fri, 18 May 2018 12:49:57 -0400 (EDT) Received: by mail-pf0-f198.google.com with SMTP id e7-v6so5020847pfi.8 for ; Fri, 18 May 2018 09:49:57 -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=m6ECx0KQSdSiOFFAH583bIiNngbR4VBU3kjNmGuZ4i72wOXhR7JWA1WxAfuA6wpqt7 aATMnYuSNUTUJFKz9/19aTJ54ZUtMwPcuA99ILJEWwiiI/9Aqw1ApsK9Jhc5Z6xWZyiF cmRUUB6eIo1LhvzW6mGpjWpcOF6AifehkRt1lMGNTFYqZFp0Xbq5+YIWEwXIZyuB54Dg j0E5woReKhvCGfo4YNxNy+qlp08KbBIrCBYmhWSe9xcQs3CkcTBWIzw7D2li9KO5CLn/ 5FGqxtUxitz1VLxw774uRBel0TTPUZlMdufMEHhLjhW2vyhJ9fgRflFmgqg+kDt4yDC+ PeXg== X-Gm-Message-State: ALKqPwcnW+GToODmcx6NbT9M4nPly0Yv7bplALeSXWVZUAUZhb7PDUOH mfTPZb8mr9WkvAIsxeWFxSsc1WfdX5QVcHpM9eCIZWWfQGWy14u8AcbpoorWk3Bss+4CZ2Cg6Il E+v+XnvRX9vVAZl6Z8+hpHhy3+Twk2dx05ECYQIXWu5TjiRhajPgPSRjlBvYmFH4= X-Received: by 2002:a62:9d5a:: with SMTP id i87-v6mr10266861pfd.190.1526662196845; Fri, 18 May 2018 09:49:56 -0700 (PDT) X-Google-Smtp-Source: AB8JxZpq9MP2bePN25C2Mw9pIPz4X8Xw6qf5rqBVir4T+eJpvJvJn0IqYv/2j1zyy8xlNuOLGuG9 X-Received: by 2002:a62:9d5a:: with SMTP id i87-v6mr10266781pfd.190.1526662194618; Fri, 18 May 2018 09:49:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526662194; cv=none; d=google.com; s=arc-20160816; b=uKwW1rz3OBZBJI+FnHCE3zVWsNRw8KGh9Z0lkHONXgHv3See9vAO5YDHTV6ygGhWvW 9OGxp+Eo5bQrEAEq4K0X5HAcKZTiazsqBlB1n8E0oSOW99nC0J2MyfnTucWt8VshC6Bc 5r5/5JpkVI1DBduk00H6/cY0xymnqr/v2x3UavQKScXwsnKopExx+GZTkNcataup+owQ uiPoSMbr+Xnq60p+dGDAb11Gt8lBfWgJAhbt1twUiH0VNur9QFQhfdA8aSIGwNRZ2+1F abQfkaN0fMMnYmm3S57WQGQvB/CGvao2I4ydQHV78jMD771xlc2MWn2F20uZ5IUTXrZf +Cew== 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=Z6ZFQtLBWTQYqvR8DIXNnVvZRojuP42nwbfxaDGQSy0MrhK3fBoSSehXJj4YoefUII LobD8hufpjbgZvqBZIiFZ6ocEvJ5am5Q3rcFYniij2zA3HY0Cmc8K6eoblgxvBKf971L DfB7a3lgC5zWn4RZwHDvoyROLxBZBMkkaNOamCMIMcQwEVnRDCVqZYMIDA9gU9q5fue3 yRqx2z2G9Ju5wf1ew1Pyn4iGIvcZIkkTQuxLqYfOdPlsYjJQMQlRzNGmOOV8tBlv0wd7 KqsvUvtwg3Pe2/3kdwltsD90W/BX8s3WPkAcFinhpKQqyHVx9xMG6JDrmcVFYGTMxpPu uEyg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=Cyz9hjpT; spf=pass (google.com: best guess record for domain of batv+77ddf8e9b1b344f28472+5381+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+77ddf8e9b1b344f28472+5381+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 r76-v6si7720229pfb.65.2018.05.18.09.49.54 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 18 May 2018 09:49:54 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of batv+77ddf8e9b1b344f28472+5381+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=Cyz9hjpT; spf=pass (google.com: best guess record for domain of batv+77ddf8e9b1b344f28472+5381+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+77ddf8e9b1b344f28472+5381+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=Cyz9hjpTsG87HPDGu68zNSSja 7Dh5czdiwpV3Tn433tbvBmtSmz8J31IsA48a/XCMBlR1+I+UL0OEL51UTktXko30p0EbaUe6YGz8v LGry5W0YeFrQ8NHRTelBAfpdAz+lqcKYoUY7YZnRWsDH7+4WCafyA42uipUvyci5M0xQ9Si49ZKRT AsK92C19sqck7yVwn46C+twgVP8zBcY9CarAAvPyF/c/JOGsQxwzl8q6KbVKLl6Sctuk64O470eJT MdF9eAO9nkPkW0x9eHoRPFo1BY+xWPJten3cJpfyOS7BTOYOq5lJ9nqPZJP8V0yGAuOfhjGF6UBED IEYPoX1Qg==; Received: from 80-109-164-210.cable.dynamic.surfer.at ([80.109.164.210] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1fJiZh-0006wv-QG; Fri, 18 May 2018 16:49:50 +0000 From: Christoph Hellwig To: linux-xfs@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org, linux-block@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 26/34] xfs: simplify xfs_map_blocks by using xfs_iext_lookup_extent directly Date: Fri, 18 May 2018 18:48:22 +0200 Message-Id: <20180518164830.1552-27-hch@lst.de> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180518164830.1552-1-hch@lst.de> References: <20180518164830.1552-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;