We don't need ->bmap anymore, only usage for it was FIBMAP, which is now
gone.
Also kill iomap_bmap() and iomap_bmap_actor once it has no users anymore.
V2:
- Kill iomap_bmap() and iomap_bmap_actor()
Signed-off-by: Carlos Maiolino <cmaiolino@xxxxxxxxxx>
---
fs/iomap.c | 34 ----------------------------------
fs/xfs/xfs_aops.c | 24 ------------------------
fs/xfs/xfs_trace.h | 1 -
3 files changed, 59 deletions(-)
diff --git a/fs/iomap.c b/fs/iomap.c
index f57c50974fa3..890751a17809 100644
--- a/fs/iomap.c
+++ b/fs/iomap.c
@@ -2138,37 +2138,3 @@ 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/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c
index 338b9d9984e0..26f5bb80d007 100644
--- a/fs/xfs/xfs_aops.c
+++ b/fs/xfs/xfs_aops.c
@@ -963,29 +963,6 @@ xfs_vm_releasepage(
return iomap_releasepage(page, gfp_mask);
}
-STATIC sector_t
-xfs_vm_bmap(
- struct address_space *mapping,
- sector_t block)
-{
- struct xfs_inode *ip = XFS_I(mapping->host);
-
- trace_xfs_vm_bmap(ip);
-
- /*
- * The swap code (ab-)uses ->bmap to get a block mapping and then
- * bypasses the file system for actual I/O. We really can't allow
- * that on reflinks inodes, so we have to skip out here. And yes,
- * 0 is the magic code for a bmap error.
- *
- * Since we don't pass back blockdev info, we can't return bmap
- * information for rt files either.
- */
- if (xfs_is_reflink_inode(ip) || XFS_IS_REALTIME_INODE(ip))
- return 0;
- return iomap_bmap(mapping, block, &xfs_iomap_ops);
-}
-
STATIC int
xfs_vm_readpage(
struct file *unused,
@@ -1024,7 +1001,6 @@ const struct address_space_operations xfs_address_space_operations = {
.set_page_dirty = iomap_set_page_dirty,
.releasepage = xfs_vm_releasepage,
.invalidatepage = xfs_vm_invalidatepage,
- .bmap = xfs_vm_bmap,
.direct_IO = noop_direct_IO,
.migratepage = iomap_migrate_page,
.is_partially_uptodate = iomap_is_partially_uptodate,
diff --git a/fs/xfs/xfs_trace.h b/fs/xfs/xfs_trace.h
index 6fcc893dfc91..aac92f2e9cdc 100644
--- a/fs/xfs/xfs_trace.h
+++ b/fs/xfs/xfs_trace.h
@@ -621,7 +621,6 @@ DEFINE_INODE_EVENT(xfs_readdir);
#ifdef CONFIG_XFS_POSIX_ACL
DEFINE_INODE_EVENT(xfs_get_acl);
#endif
-DEFINE_INODE_EVENT(xfs_vm_bmap);
DEFINE_INODE_EVENT(xfs_file_ioctl);
DEFINE_INODE_EVENT(xfs_file_compat_ioctl);
DEFINE_INODE_EVENT(xfs_ioctl_setattr);
--
2.17.2
