From patchwork Fri May 18 16:48:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10411285 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 282A260353 for ; Fri, 18 May 2018 16:49:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1752928619 for ; Fri, 18 May 2018 16:49:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0BEFA288BD; Fri, 18 May 2018 16:49:27 +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=ham 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 9748B28894 for ; Fri, 18 May 2018 16:49:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7850F6B0611; Fri, 18 May 2018 12:49:16 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 6E2946B0612; Fri, 18 May 2018 12:49:16 -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 55DB26B0613; Fri, 18 May 2018 12:49:16 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf0-f200.google.com (mail-pf0-f200.google.com [209.85.192.200]) by kanga.kvack.org (Postfix) with ESMTP id 113516B0611 for ; Fri, 18 May 2018 12:49:16 -0400 (EDT) Received: by mail-pf0-f200.google.com with SMTP id c187-v6so5046991pfa.20 for ; Fri, 18 May 2018 09:49:16 -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=6+RgIQxjxnUBcColKSeMd24PgiZ+EX6nOTCIPCUlY04=; b=HV8lRP8airV3nD2IqmrnK/hSSHeKbm2Jzm/fS4rf2rkw+UGu+LXtA8P5htoQAFPdHD c9F0Sz5BDLVV7Q7x32VSOBsrYIzrdfc/O3Yg6LBG+0EFF939mt01t9wSyoSrtE4z31R5 qtqs+TaOw4swJidHz9WEqKKEHjLr6cRZcg9vi50yBa6jq8KeGnDNON9gOFzqbWpsEHD5 T3vPM2O6+aOxCxiR5sL60r+PCg4xhL8/pCkxji1/DtcVEY5MwrapPeP7uHe17ab3L4JI CKNmFwjzfKJnYnlOpXSzXCVyMKgNLDp30lJsgPGqNRgHsNSK+JYJltE21ZPL8FmWUT1w vnfA== X-Gm-Message-State: ALKqPweBVQ+TMtxHeBM9FUTYpQXHq7Bw3QT0YGYP9ndB55k3OvTBTCK6 odMGKfS1W1VDDMJJD/1tUoQJ7tYZH2KKHamvkakWcqruZwsoXxuz/THa5g7rqsV7oSuvaZFWMMu XMdcWA0C4agrjcFAgrH1CAvUYysVx2ofrpIZZV8OSnvp/HEqQUFR2SwZt2GNg2Zc= X-Received: by 2002:a17:902:24b:: with SMTP id 69-v6mr10452184plc.54.1526662155740; Fri, 18 May 2018 09:49:15 -0700 (PDT) X-Google-Smtp-Source: AB8JxZrt+nCxl4RnM9XXdQ2JkndBLaXgWL3kZqT7UBweyW7bTlURB+zn/Ibm9Yk0FquTvKozOyYE X-Received: by 2002:a17:902:24b:: with SMTP id 69-v6mr10452149plc.54.1526662155051; Fri, 18 May 2018 09:49:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526662155; cv=none; d=google.com; s=arc-20160816; b=lZA7ZT4R4FzRAt3e36D9Kc7b62cIwqyAEdGyiVF6iPBuzM7vjfqn1LROtb0nQVjtP9 4dDbf+s30DH4uKrCV65M/3Eq+cK6AZhnxuCGZ6P22FLddR3YhL3yVcFVbVJv+eM5vfmv HxUpuz0oFgHF5aH1Fr4hPARSfThAikXGtG3iMRVmUFyvO14lGkqWItWBH64CvMI1PNvP IEzBGn7yRntN6vXg+Qs/V5/efAI4IRlDmGk+STpgyeY/mfD6Q+MqG5QmqPboR5Re12WO OJCNb+pdkkOaUyvgtigLpCATpTVuI0X1Y0J2Sdv+tVAI7W51s3B3kYMTf1mJgyepieTK EV/w== 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=6+RgIQxjxnUBcColKSeMd24PgiZ+EX6nOTCIPCUlY04=; b=aMRRQIZ8G+pUlJmvQtvSdQemUsiFwW7nNn8zWqKuSjh6YJONPgkimrNyRYLgp4xjT5 RP153qONh745JKLUTYUkw02fxZBg1PSK62pj7D2BBvFp5ffMa9ES67ZF+3clgVKk8ICP 1zD1XCk0GyVfSoVQQMrlr0HK6OZTe+nEnEOS8aFI0XnKrnTCZTVt6cbomDdBrKVG03Yd /OUOjYDeD1FDUCQqq67xEWsjjfmGDgw/BziGXuuRmfbUO9nbsSjt/mzmqrX09I+K5YFG FH2/3IN78vspCh3d90fIuOEZ0g2lJfp0UnjpHSLBOc/fv44zqgI2KFk7CuZqpjcN+QWC Go3A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=oNL4/iJj; 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 z16-v6si7396310plo.5.2018.05.18.09.49.14 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 18 May 2018 09:49:15 -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=oNL4/iJj; 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=6+RgIQxjxnUBcColKSeMd24PgiZ+EX6nOTCIPCUlY04=; b=oNL4/iJjeuX2s1LOGNXYJ6h9u oBIQdi3HKUE6WC4pCPF797TeTa+Lual7Gvs4rxZWq9cUkbxTLXWqTMLgNJukkCjIijlFLV2K6nieU oNZMc3BKAfIM+n0IaAlEyDRBoR5ZN3G8kohhgj3LwXugfUp9FQNnS6gulmWxTkzV69r16n5F3AYP1 vkSZWBSkLlIZ9gc8c+xcBStXzoEQh89J6etUZMu/muem+Huw28bJpmdrrcTX6IWc9uVMMJD235uVc gCx2/JHfYFlxNLneCbz+yZeBZ2d5tlv5laqH+e7AVFQnJ9LoONY3rCFTmizM6aL9f99lUFGvFhfaz +LjeOx0xw==; 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 1fJiZ8-0006Yv-5v; Fri, 18 May 2018 16:49:14 +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 14/34] iomap: add an iomap-based bmap implementation Date: Fri, 18 May 2018 18:48:10 +0200 Message-Id: <20180518164830.1552-15-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 This adds a simple iomap-based implementation of the legacy ->bmap interface. Note that we can't easily add checks for rt or reflink files, so these will have to remain in the callers. This interface just needs to die.. Signed-off-by: Christoph Hellwig --- fs/iomap.c | 34 ++++++++++++++++++++++++++++++++++ include/linux/iomap.h | 3 +++ 2 files changed, 37 insertions(+) diff --git a/fs/iomap.c b/fs/iomap.c index 44259eadb69d..7c1b071d115c 100644 --- a/fs/iomap.c +++ b/fs/iomap.c @@ -1419,3 +1419,37 @@ int iomap_swapfile_activate(struct swap_info_struct *sis, } EXPORT_SYMBOL_GPL(iomap_swapfile_activate); #endif /* CONFIG_SWAP */ + +static loff_t +iomap_bmap_actor(struct inode *inode, loff_t pos, loff_t length, + void *data, struct iomap *iomap) +{ + sector_t *bno = data, addr; + + if (iomap->type == IOMAP_MAPPED) { + addr = (pos - iomap->offset + iomap->addr) >> inode->i_blkbits; + if (addr > INT_MAX) + WARN(1, "would truncate bmap result\n"); + else + *bno = addr; + } + return 0; +} + +/* legacy ->bmap interface. 0 is the error return (!) */ +sector_t +iomap_bmap(struct address_space *mapping, sector_t bno, + const struct iomap_ops *ops) +{ + struct inode *inode = mapping->host; + loff_t pos = bno >> inode->i_blkbits; + unsigned blocksize = i_blocksize(inode); + + if (filemap_write_and_wait(mapping)) + return 0; + + bno = 0; + iomap_apply(inode, pos, blocksize, 0, ops, &bno, iomap_bmap_actor); + return bno; +} +EXPORT_SYMBOL_GPL(iomap_bmap); diff --git a/include/linux/iomap.h b/include/linux/iomap.h index 819e0cd2a950..a044a824da85 100644 --- a/include/linux/iomap.h +++ b/include/linux/iomap.h @@ -4,6 +4,7 @@ #include +struct address_space; struct fiemap_extent_info; struct inode; struct iov_iter; @@ -100,6 +101,8 @@ loff_t iomap_seek_hole(struct inode *inode, loff_t offset, const struct iomap_ops *ops); loff_t iomap_seek_data(struct inode *inode, loff_t offset, const struct iomap_ops *ops); +sector_t iomap_bmap(struct address_space *mapping, sector_t bno, + const struct iomap_ops *ops); /* * Flags for direct I/O ->end_io: