| Message ID | 20180523144357.18985-18-hch@lst.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, May 23, 2018 at 04:43:40PM +0200, Christoph Hellwig wrote: > Switch to the iomap based bmap implementation to get rid of one of the > last users of xfs_get_blocks. > > Signed-off-by: Christoph Hellwig <hch@lst.de> Looks ok, Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> --D > --- > fs/xfs/xfs_aops.c | 9 +++------ > 1 file changed, 3 insertions(+), 6 deletions(-) > > diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c > index 80de476cecf8..56e405572909 100644 > --- a/fs/xfs/xfs_aops.c > +++ b/fs/xfs/xfs_aops.c > @@ -1378,10 +1378,9 @@ xfs_vm_bmap( > struct address_space *mapping, > sector_t block) > { > - struct inode *inode = (struct inode *)mapping->host; > - struct xfs_inode *ip = XFS_I(inode); > + struct xfs_inode *ip = XFS_I(mapping->host); > > - trace_xfs_vm_bmap(XFS_I(inode)); > + trace_xfs_vm_bmap(ip); > > /* > * The swap code (ab-)uses ->bmap to get a block mapping and then > @@ -1394,9 +1393,7 @@ xfs_vm_bmap( > */ > if (xfs_is_reflink_inode(ip) || XFS_IS_REALTIME_INODE(ip)) > return 0; > - > - filemap_write_and_wait(mapping); > - return generic_block_bmap(mapping, block, xfs_get_blocks); > + return iomap_bmap(mapping, block, &xfs_iomap_ops); > } > > STATIC int > -- > 2.17.0 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-xfs" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c index 80de476cecf8..56e405572909 100644 --- a/fs/xfs/xfs_aops.c +++ b/fs/xfs/xfs_aops.c @@ -1378,10 +1378,9 @@ xfs_vm_bmap( struct address_space *mapping, sector_t block) { - struct inode *inode = (struct inode *)mapping->host; - struct xfs_inode *ip = XFS_I(inode); + struct xfs_inode *ip = XFS_I(mapping->host); - trace_xfs_vm_bmap(XFS_I(inode)); + trace_xfs_vm_bmap(ip); /* * The swap code (ab-)uses ->bmap to get a block mapping and then @@ -1394,9 +1393,7 @@ xfs_vm_bmap( */ if (xfs_is_reflink_inode(ip) || XFS_IS_REALTIME_INODE(ip)) return 0; - - filemap_write_and_wait(mapping); - return generic_block_bmap(mapping, block, xfs_get_blocks); + return iomap_bmap(mapping, block, &xfs_iomap_ops); } STATIC int
Switch to the iomap based bmap implementation to get rid of one of the last users of xfs_get_blocks. Signed-off-by: Christoph Hellwig <hch@lst.de> --- fs/xfs/xfs_aops.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)