From: Carlos Maiolino <cmaiolino@redhat.com> To: linux-fsdevel@vger.kernel.org Cc: hch@lst.de, adilger@dilger.ca, sandeen@redhat.com, david@fromorbit.com Subject: [PATCH 02/10] cachefiles: drop direct usage of ->bmap method. Date: Wed, 5 Dec 2018 10:17:20 +0100 Message-ID: <20181205091728.29903-3-cmaiolino@redhat.com> (raw) In-Reply-To: <20181205091728.29903-1-cmaiolino@redhat.com> Replace the direct usage of ->bmap method by a bmap() call. Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Carlos Maiolino <cmaiolino@redhat.com> --- fs/cachefiles/rdwr.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/fs/cachefiles/rdwr.c b/fs/cachefiles/rdwr.c index 40f7595aad10..a3ee23fe9269 100644 --- a/fs/cachefiles/rdwr.c +++ b/fs/cachefiles/rdwr.c @@ -400,7 +400,7 @@ int cachefiles_read_or_alloc_page(struct fscache_retrieval *op, struct cachefiles_object *object; struct cachefiles_cache *cache; struct inode *inode; - sector_t block0, block; + sector_t block; unsigned shift; int ret; @@ -416,7 +416,6 @@ int cachefiles_read_or_alloc_page(struct fscache_retrieval *op, inode = d_backing_inode(object->backer); ASSERT(S_ISREG(inode->i_mode)); - ASSERT(inode->i_mapping->a_ops->bmap); ASSERT(inode->i_mapping->a_ops->readpages); /* calculate the shift required to use bmap */ @@ -432,12 +431,14 @@ int cachefiles_read_or_alloc_page(struct fscache_retrieval *op, * enough for this as it doesn't indicate errors, but it's all we've * got for the moment */ - block0 = page->index; - block0 <<= shift; + block = page->index; + block <<= shift; + + ret = bmap(inode, &block); + ASSERT(!ret); - block = inode->i_mapping->a_ops->bmap(inode->i_mapping, block0); _debug("%llx -> %llx", - (unsigned long long) block0, + (unsigned long long) (page->index << shift), (unsigned long long) block); if (block) { @@ -709,7 +710,6 @@ int cachefiles_read_or_alloc_pages(struct fscache_retrieval *op, inode = d_backing_inode(object->backer); ASSERT(S_ISREG(inode->i_mode)); - ASSERT(inode->i_mapping->a_ops->bmap); ASSERT(inode->i_mapping->a_ops->readpages); /* calculate the shift required to use bmap */ @@ -726,7 +726,7 @@ int cachefiles_read_or_alloc_pages(struct fscache_retrieval *op, ret = space ? -ENODATA : -ENOBUFS; list_for_each_entry_safe(page, _n, pages, lru) { - sector_t block0, block; + sector_t block; /* we assume the absence or presence of the first block is a * good enough indication for the page as a whole @@ -734,13 +734,14 @@ int cachefiles_read_or_alloc_pages(struct fscache_retrieval *op, * good enough for this as it doesn't indicate errors, but * it's all we've got for the moment */ - block0 = page->index; - block0 <<= shift; + block = page->index; + block <<= shift; + + ret = bmap(inode, &block); + ASSERT(!ret); - block = inode->i_mapping->a_ops->bmap(inode->i_mapping, - block0); _debug("%llx -> %llx", - (unsigned long long) block0, + (unsigned long long) (page->index << shift), (unsigned long long) block); if (block) { -- 2.17.2
next prev parent reply index Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-12-05 9:17 [PATCH 00/10 V2] New ->fiemap infrastructure and ->bmap removal Carlos Maiolino 2018-12-05 9:17 ` [PATCH 01/10] fs: Enable bmap() function to properly return errors Carlos Maiolino 2018-12-05 9:17 ` Carlos Maiolino [this message] 2018-12-05 9:17 ` [PATCH 03/10] ecryptfs: drop direct calls to ->bmap Carlos Maiolino 2018-12-05 9:17 ` [PATCH 04/10 V2] fibmap: Use bmap instead of ->bmap method in ioctl_fibmap Carlos Maiolino 2019-01-14 16:49 ` Christoph Hellwig 2019-02-04 11:34 ` Carlos Maiolino 2018-12-05 9:17 ` [PATCH 05/10] fs: Move start and length fiemap fields into fiemap_extent_info Carlos Maiolino 2019-01-14 16:50 ` Christoph Hellwig 2018-12-05 9:17 ` [PATCH 06/10] iomap: Remove length and start fields from iomap_fiemap Carlos Maiolino 2019-01-14 16:51 ` Christoph Hellwig 2018-12-05 9:17 ` [PATCH 07/10] fs: Use a void pointer to store fiemap_extent Carlos Maiolino 2019-01-14 16:53 ` Christoph Hellwig 2018-12-05 9:17 ` [PATCH 08/10 V2] fiemap: Use a callback to fill fiemap extents Carlos Maiolino 2019-01-14 16:53 ` Christoph Hellwig 2018-12-05 9:17 ` [PATCH 09/10 V2] Use FIEMAP for FIBMAP calls Carlos Maiolino 2018-12-05 17:36 ` Darrick J. Wong 2018-12-07 9:09 ` Carlos Maiolino 2018-12-07 20:14 ` Andreas Dilger 2019-02-04 15:11 ` Carlos Maiolino 2019-02-04 18:27 ` Darrick J. Wong 2019-02-06 13:37 ` Carlos Maiolino 2019-02-06 20:44 ` Darrick J. Wong 2019-02-06 21:13 ` Andreas Dilger 2019-02-07 9:52 ` Carlos Maiolino 2019-02-08 8:43 ` Christoph Hellwig 2019-02-11 12:57 ` Christoph Hellwig 2019-02-11 16:21 ` Carlos Maiolino 2019-02-11 16:48 ` Christoph Hellwig 2019-02-07 11:59 ` Carlos Maiolino 2019-02-07 17:02 ` Darrick J. Wong 2019-02-07 21:25 ` Andreas Dilger 2019-02-08 8:46 ` Christoph Hellwig 2019-02-08 10:36 ` Carlos Maiolino 2019-02-08 21:03 ` Andreas Dilger 2019-02-08 9:08 ` Carlos Maiolino 2019-02-08 9:03 ` Carlos Maiolino 2019-02-07 12:36 ` Carlos Maiolino 2019-02-07 18:16 ` Darrick J. Wong 2019-02-08 8:58 ` Carlos Maiolino 2019-02-06 21:04 ` Andreas Dilger 2019-01-14 16:56 ` Christoph Hellwig 2019-02-05 9:56 ` Carlos Maiolino 2019-02-05 18:25 ` Christoph Hellwig 2019-02-06 9:50 ` Carlos Maiolino 2018-12-05 9:17 ` [PATCH 10/10] xfs: Get rid of ->bmap Carlos Maiolino 2018-12-05 17:37 ` Darrick J. Wong 2018-12-06 13:06 ` Carlos Maiolino 2018-12-06 18:56 ` [PATCH 00/10 V2] New ->fiemap infrastructure and ->bmap removal Andreas Grünbacher 2018-12-07 9:34 ` Carlos Maiolino 2019-01-14 16:50 ` Christoph Hellwig 2019-01-14 17:56 ` Andreas Grünbacher 2019-01-14 17:58 ` Christoph Hellwig
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=20181205091728.29903-3-cmaiolino@redhat.com \ --to=cmaiolino@redhat.com \ --cc=adilger@dilger.ca \ --cc=david@fromorbit.com \ --cc=hch@lst.de \ --cc=linux-fsdevel@vger.kernel.org \ --cc=sandeen@redhat.com \ /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: link
Linux-Fsdevel Archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/linux-fsdevel/0 linux-fsdevel/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 linux-fsdevel linux-fsdevel/ https://lore.kernel.org/linux-fsdevel \ linux-fsdevel@vger.kernel.org public-inbox-index linux-fsdevel Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/org.kernel.vger.linux-fsdevel AGPL code for this site: git clone https://public-inbox.org/public-inbox.git