From: "Darrick J. Wong" <djwong@kernel.org> To: Christoph Hellwig <hch@lst.de> Cc: Dan Williams <dan.j.williams@intel.com>, Matthew Wilcox <willy@infradead.org>, Andreas Gruenbacher <agruenba@redhat.com>, Shiyang Ruan <ruansy.fnst@fujitsu.com>, linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-btrfs@vger.kernel.org, nvdimm@lists.linux.dev, cluster-devel@redhat.com Subject: [PATCH v2.1 19/30] iomap: switch iomap_bmap to use iomap_iter Date: Wed, 11 Aug 2021 12:18:00 -0700 [thread overview] Message-ID: <20210811191800.GH3601443@magnolia> (raw) In-Reply-To: <20210809061244.1196573-20-hch@lst.de> From: Christoph Hellwig <hch@lst.de> Rewrite the ->bmap implementation based on iomap_iter. Signed-off-by: Christoph Hellwig <hch@lst.de> [djwong: restructure the loop to make its behavior a little clearer] Reviewed-by: Darrick J. Wong <djwong@kernel.org> Signed-off-by: Darrick J. Wong <djwong@kernel.org> --- fs/iomap/fiemap.c | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/fs/iomap/fiemap.c b/fs/iomap/fiemap.c index acad09a8c188..66cf267c68ae 100644 --- a/fs/iomap/fiemap.c +++ b/fs/iomap/fiemap.c @@ -92,37 +92,32 @@ int iomap_fiemap(struct inode *inode, struct fiemap_extent_info *fi, } EXPORT_SYMBOL_GPL(iomap_fiemap); -static loff_t -iomap_bmap_actor(struct inode *inode, loff_t pos, loff_t length, - void *data, struct iomap *iomap, struct iomap *srcmap) -{ - sector_t *bno = data, addr; - - if (iomap->type == IOMAP_MAPPED) { - addr = (pos - iomap->offset + iomap->addr) >> inode->i_blkbits; - *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); + struct iomap_iter iter = { + .inode = mapping->host, + .pos = (loff_t)bno << mapping->host->i_blkbits, + .len = i_blocksize(mapping->host), + .flags = IOMAP_REPORT, + }; + const unsigned int blkshift = mapping->host->i_blkbits - SECTOR_SHIFT; int ret; if (filemap_write_and_wait(mapping)) return 0; bno = 0; - ret = iomap_apply(inode, pos, blocksize, 0, ops, &bno, - iomap_bmap_actor); + while ((ret = iomap_iter(&iter, ops)) > 0) { + if (iter.iomap.type == IOMAP_MAPPED) + bno = iomap_sector(&iter.iomap, iter.pos) >> blkshift; + /* leave iter.processed unset to abort loop */ + } if (ret) return 0; + return bno; } EXPORT_SYMBOL_GPL(iomap_bmap);
WARNING: multiple messages have this Message-ID (diff)
From: Darrick J. Wong <djwong@kernel.org> To: cluster-devel.redhat.com Subject: [Cluster-devel] [PATCH v2.1 19/30] iomap: switch iomap_bmap to use iomap_iter Date: Wed, 11 Aug 2021 12:18:00 -0700 [thread overview] Message-ID: <20210811191800.GH3601443@magnolia> (raw) In-Reply-To: <20210809061244.1196573-20-hch@lst.de> From: Christoph Hellwig <hch@lst.de> Rewrite the ->bmap implementation based on iomap_iter. Signed-off-by: Christoph Hellwig <hch@lst.de> [djwong: restructure the loop to make its behavior a little clearer] Reviewed-by: Darrick J. Wong <djwong@kernel.org> Signed-off-by: Darrick J. Wong <djwong@kernel.org> --- fs/iomap/fiemap.c | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/fs/iomap/fiemap.c b/fs/iomap/fiemap.c index acad09a8c188..66cf267c68ae 100644 --- a/fs/iomap/fiemap.c +++ b/fs/iomap/fiemap.c @@ -92,37 +92,32 @@ int iomap_fiemap(struct inode *inode, struct fiemap_extent_info *fi, } EXPORT_SYMBOL_GPL(iomap_fiemap); -static loff_t -iomap_bmap_actor(struct inode *inode, loff_t pos, loff_t length, - void *data, struct iomap *iomap, struct iomap *srcmap) -{ - sector_t *bno = data, addr; - - if (iomap->type == IOMAP_MAPPED) { - addr = (pos - iomap->offset + iomap->addr) >> inode->i_blkbits; - *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); + struct iomap_iter iter = { + .inode = mapping->host, + .pos = (loff_t)bno << mapping->host->i_blkbits, + .len = i_blocksize(mapping->host), + .flags = IOMAP_REPORT, + }; + const unsigned int blkshift = mapping->host->i_blkbits - SECTOR_SHIFT; int ret; if (filemap_write_and_wait(mapping)) return 0; bno = 0; - ret = iomap_apply(inode, pos, blocksize, 0, ops, &bno, - iomap_bmap_actor); + while ((ret = iomap_iter(&iter, ops)) > 0) { + if (iter.iomap.type == IOMAP_MAPPED) + bno = iomap_sector(&iter.iomap, iter.pos) >> blkshift; + /* leave iter.processed unset to abort loop */ + } if (ret) return 0; + return bno; } EXPORT_SYMBOL_GPL(iomap_bmap);
next prev parent reply other threads:[~2021-08-11 19:18 UTC|newest] Thread overview: 144+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-08-09 6:12 switch iomap to an iterator model v2 Christoph Hellwig 2021-08-09 6:12 ` [Cluster-devel] " Christoph Hellwig 2021-08-09 6:12 ` [PATCH 01/30] iomap: fix a trivial comment typo in trace.h Christoph Hellwig 2021-08-09 6:12 ` [Cluster-devel] " Christoph Hellwig 2021-08-09 6:12 ` [PATCH 02/30] iomap: remove the iomap arguments to ->page_{prepare,done} Christoph Hellwig 2021-08-09 6:12 ` [Cluster-devel] [PATCH 02/30] iomap: remove the iomap arguments to ->page_{prepare, done} Christoph Hellwig 2021-08-09 6:12 ` [PATCH 03/30] iomap: mark the iomap argument to iomap_sector const Christoph Hellwig 2021-08-09 6:12 ` [Cluster-devel] " Christoph Hellwig 2021-08-09 6:12 ` [PATCH 04/30] iomap: mark the iomap argument to iomap_inline_data const Christoph Hellwig 2021-08-09 6:12 ` [Cluster-devel] " Christoph Hellwig 2021-08-09 16:17 ` Darrick J. Wong 2021-08-09 16:17 ` [Cluster-devel] " Darrick J. Wong 2021-08-09 6:12 ` [PATCH 05/30] iomap: mark the iomap argument to iomap_inline_data_valid const Christoph Hellwig 2021-08-09 6:12 ` [Cluster-devel] " Christoph Hellwig 2021-08-09 16:17 ` Darrick J. Wong 2021-08-09 16:17 ` [Cluster-devel] " Darrick J. Wong 2021-08-09 6:12 ` [PATCH 06/30] fs: mark the iomap argument to __block_write_begin_int const Christoph Hellwig 2021-08-09 6:12 ` [Cluster-devel] " Christoph Hellwig 2021-08-09 6:12 ` [PATCH 07/30] fsdax: mark the iomap argument to dax_iomap_sector as const Christoph Hellwig 2021-08-09 6:12 ` [Cluster-devel] " Christoph Hellwig 2021-08-19 20:35 ` Dan Williams 2021-08-19 20:35 ` [Cluster-devel] " Dan Williams 2021-08-19 20:35 ` Dan Williams 2021-08-09 6:12 ` [PATCH 08/30] iomap: mark the iomap argument to iomap_read_inline_data const Christoph Hellwig 2021-08-09 6:12 ` [Cluster-devel] " Christoph Hellwig 2021-08-09 6:12 ` [PATCH 09/30] iomap: mark the iomap argument to iomap_read_page_sync const Christoph Hellwig 2021-08-09 6:12 ` [Cluster-devel] " Christoph Hellwig 2021-08-09 6:12 ` [PATCH 10/30] iomap: fix the iomap_readpage_actor return value for inline data Christoph Hellwig 2021-08-09 6:12 ` [Cluster-devel] " Christoph Hellwig 2021-08-10 23:31 ` Darrick J. Wong 2021-08-10 23:31 ` [Cluster-devel] " Darrick J. Wong 2021-08-09 6:12 ` [PATCH 11/30] iomap: add the new iomap_iter model Christoph Hellwig 2021-08-09 6:12 ` [Cluster-devel] " Christoph Hellwig 2021-08-09 22:10 ` Dave Chinner 2021-08-09 22:10 ` [Cluster-devel] " Dave Chinner 2021-08-10 6:45 ` Darrick J. Wong 2021-08-10 6:45 ` [Cluster-devel] " Darrick J. Wong 2021-08-10 7:13 ` Christoph Hellwig 2021-08-10 7:13 ` [Cluster-devel] " Christoph Hellwig 2021-08-11 0:31 ` Darrick J. Wong 2021-08-11 0:31 ` [Cluster-devel] " Darrick J. Wong 2021-08-11 5:38 ` Christoph Hellwig 2021-08-11 5:38 ` [Cluster-devel] " Christoph Hellwig 2021-08-11 19:17 ` Darrick J. Wong 2021-08-11 19:17 ` [Cluster-devel] " Darrick J. Wong 2021-08-12 6:49 ` Christoph Hellwig 2021-08-12 6:49 ` [Cluster-devel] " Christoph Hellwig 2021-08-12 18:20 ` Darrick J. Wong 2021-08-12 18:20 ` [Cluster-devel] " Darrick J. Wong 2021-08-13 7:29 ` Christoph Hellwig 2021-08-13 7:29 ` [Cluster-devel] " Christoph Hellwig 2021-08-11 19:17 ` [PATCH v2.1 " Darrick J. Wong 2021-08-11 19:17 ` [Cluster-devel] " Darrick J. Wong 2021-08-17 2:34 ` Dave Chinner 2021-08-17 2:34 ` [Cluster-devel] " Dave Chinner 2021-08-19 21:25 ` [PATCH " Dan Williams 2021-08-19 21:25 ` [Cluster-devel] " Dan Williams 2021-08-19 21:25 ` Dan Williams 2021-08-20 4:11 ` Christoph Hellwig 2021-08-20 4:11 ` [Cluster-devel] " Christoph Hellwig 2021-08-20 15:27 ` Dan Williams 2021-08-20 15:27 ` [Cluster-devel] " Dan Williams 2021-08-20 15:27 ` Dan Williams 2021-08-09 6:12 ` [PATCH 12/30] iomap: switch readahead and readpage to use iomap_iter Christoph Hellwig 2021-08-09 6:12 ` [Cluster-devel] " Christoph Hellwig 2021-08-10 23:46 ` Darrick J. Wong 2021-08-10 23:46 ` [Cluster-devel] " Darrick J. Wong 2021-08-09 6:12 ` [PATCH 13/30] iomap: switch iomap_file_buffered_write " Christoph Hellwig 2021-08-09 6:12 ` [Cluster-devel] " Christoph Hellwig 2021-08-10 23:53 ` Darrick J. Wong 2021-08-10 23:53 ` [Cluster-devel] " Darrick J. Wong 2021-08-09 6:12 ` [PATCH 14/30] iomap: switch iomap_file_unshare " Christoph Hellwig 2021-08-09 6:12 ` [Cluster-devel] " Christoph Hellwig 2021-08-10 23:54 ` Darrick J. Wong 2021-08-10 23:54 ` [Cluster-devel] " Darrick J. Wong 2021-08-09 6:12 ` [PATCH 15/30] iomap: switch iomap_zero_range " Christoph Hellwig 2021-08-09 6:12 ` [Cluster-devel] " Christoph Hellwig 2021-08-10 23:54 ` Darrick J. Wong 2021-08-10 23:54 ` [Cluster-devel] " Darrick J. Wong 2021-08-09 6:12 ` [PATCH 16/30] iomap: switch iomap_page_mkwrite " Christoph Hellwig 2021-08-09 6:12 ` [Cluster-devel] " Christoph Hellwig 2021-08-10 23:58 ` Darrick J. Wong 2021-08-10 23:58 ` [Cluster-devel] " Darrick J. Wong 2021-08-09 6:12 ` [PATCH 17/30] iomap: switch __iomap_dio_rw " Christoph Hellwig 2021-08-09 6:12 ` [Cluster-devel] " Christoph Hellwig 2021-08-11 0:17 ` Darrick J. Wong 2021-08-11 0:17 ` [Cluster-devel] " Darrick J. Wong 2021-08-09 6:12 ` [PATCH 18/30] iomap: switch iomap_fiemap " Christoph Hellwig 2021-08-09 6:12 ` [Cluster-devel] " Christoph Hellwig 2021-08-11 0:05 ` Darrick J. Wong 2021-08-11 0:05 ` [Cluster-devel] " Darrick J. Wong 2021-08-09 6:12 ` [PATCH 19/30] iomap: switch iomap_bmap " Christoph Hellwig 2021-08-09 6:12 ` [Cluster-devel] " Christoph Hellwig 2021-08-10 6:39 ` Darrick J. Wong 2021-08-10 6:39 ` [Cluster-devel] " Darrick J. Wong 2021-08-10 7:13 ` Christoph Hellwig 2021-08-10 7:13 ` [Cluster-devel] " Christoph Hellwig 2021-08-11 19:18 ` Darrick J. Wong [this message] 2021-08-11 19:18 ` [Cluster-devel] [PATCH v2.1 " Darrick J. Wong 2021-08-12 6:50 ` Christoph Hellwig 2021-08-12 6:50 ` [Cluster-devel] " Christoph Hellwig 2021-08-17 2:35 ` Dave Chinner 2021-08-17 2:35 ` [Cluster-devel] " Dave Chinner 2021-08-09 6:12 ` [PATCH 20/30] iomap: switch iomap_seek_hole " Christoph Hellwig 2021-08-09 6:12 ` [Cluster-devel] " Christoph Hellwig 2021-08-11 0:13 ` Darrick J. Wong 2021-08-11 0:13 ` [Cluster-devel] " Darrick J. Wong 2021-08-09 6:12 ` [PATCH 21/30] iomap: switch iomap_seek_data " Christoph Hellwig 2021-08-09 6:12 ` [Cluster-devel] " Christoph Hellwig 2021-08-11 0:12 ` Darrick J. Wong 2021-08-11 0:12 ` [Cluster-devel] " Darrick J. Wong 2021-08-09 6:12 ` [PATCH 22/30] iomap: switch iomap_swapfile_activate " Christoph Hellwig 2021-08-09 6:12 ` [Cluster-devel] " Christoph Hellwig 2021-08-11 0:08 ` Darrick J. Wong 2021-08-11 0:08 ` [Cluster-devel] " Darrick J. Wong 2021-08-09 6:12 ` [PATCH 23/30] fsdax: switch dax_iomap_rw " Christoph Hellwig 2021-08-09 6:12 ` [Cluster-devel] " Christoph Hellwig 2021-08-11 0:07 ` Darrick J. Wong 2021-08-11 0:07 ` [Cluster-devel] " Darrick J. Wong 2021-08-19 21:55 ` Dan Williams 2021-08-19 21:55 ` [Cluster-devel] " Dan Williams 2021-08-19 21:55 ` Dan Williams 2021-08-09 6:12 ` [PATCH 24/30] iomap: remove iomap_apply Christoph Hellwig 2021-08-09 6:12 ` [Cluster-devel] " Christoph Hellwig 2021-08-11 19:18 ` [PATCH v2.1 " Darrick J. Wong 2021-08-11 19:18 ` [Cluster-devel] " Darrick J. Wong 2021-08-17 2:36 ` Dave Chinner 2021-08-17 2:36 ` [Cluster-devel] " Dave Chinner 2021-08-09 6:12 ` [PATCH 25/30] iomap: pass an iomap_iter to various buffered I/O helpers Christoph Hellwig 2021-08-09 6:12 ` [Cluster-devel] " Christoph Hellwig 2021-08-09 6:12 ` [PATCH 26/30] iomap: rework unshare flag Christoph Hellwig 2021-08-09 6:12 ` [Cluster-devel] " Christoph Hellwig 2021-08-09 6:12 ` [PATCH 27/30] fsdax: factor out helpers to simplify the dax fault code Christoph Hellwig 2021-08-09 6:12 ` [Cluster-devel] " Christoph Hellwig 2021-08-09 6:12 ` [PATCH 28/30] fsdax: factor out a dax_fault_actor() helper Christoph Hellwig 2021-08-09 6:12 ` [Cluster-devel] " Christoph Hellwig 2021-08-09 6:12 ` [PATCH 29/30] fsdax: switch the fault handlers to use iomap_iter Christoph Hellwig 2021-08-09 6:12 ` [Cluster-devel] " Christoph Hellwig 2021-08-09 6:12 ` [PATCH 30/30] iomap: constify iomap_iter_srcmap Christoph Hellwig 2021-08-09 6:12 ` [Cluster-devel] " Christoph Hellwig 2021-08-11 19:19 ` [PATCH 31/30] iomap: move iomap iteration code to iter.c Darrick J. Wong 2021-08-11 19:19 ` [Cluster-devel] " Darrick J. Wong 2021-08-17 2:37 ` Dave Chinner 2021-08-17 2:37 ` [Cluster-devel] " Dave Chinner
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210811191800.GH3601443@magnolia \ --to=djwong@kernel.org \ --cc=agruenba@redhat.com \ --cc=cluster-devel@redhat.com \ --cc=dan.j.williams@intel.com \ --cc=hch@lst.de \ --cc=linux-btrfs@vger.kernel.org \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-xfs@vger.kernel.org \ --cc=nvdimm@lists.linux.dev \ --cc=ruansy.fnst@fujitsu.com \ --cc=willy@infradead.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.