Skip to content

L
linux
Commit 26d0eaef authored by Nathan Scott's avatar Nathan Scott
Browse files
Options

[XFS] Use iomap abstraction consistently. 

SGI Modid: 2.5.x-xfs:slinx:162327a
parent acc0e94e
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
fs/xfs/linux/xfs_aops.c
View file @ 26d0eaef
...@@ -184,13 +184,13 @@ map_buffer_at_offset( ...@@ -184,13 +184,13 @@ map_buffer_at_offset(
int block_bits, int block_bits,
xfs_iomap_t *iomapp) xfs_iomap_t *iomapp)
{ {
page_buf_daddr_t bn; xfs_daddr_t bn;
loff_t delta; loff_t delta;
int sector_shift; int sector_shift;
ASSERT(!(iomapp->iomap_flags & IOMAP_HOLE)); ASSERT(!(iomapp->iomap_flags & IOMAP_HOLE));
ASSERT(!(iomapp->iomap_flags & IOMAP_DELAY)); ASSERT(!(iomapp->iomap_flags & IOMAP_DELAY));
ASSERT(iomapp->iomap_bn != PAGE_BUF_DADDR_NULL); ASSERT(iomapp->iomap_bn != IOMAP_DADDR_NULL);
delta = page->index; delta = page->index;
delta <<= PAGE_CACHE_SHIFT; delta <<= PAGE_CACHE_SHIFT;
...@@ -870,8 +870,8 @@ linvfs_get_block_core( ...@@ -870,8 +870,8 @@ linvfs_get_block_core(
if (retpbbm == 0) if (retpbbm == 0)
return 0; return 0;
if (iomap.iomap_bn != PAGE_BUF_DADDR_NULL) { if (iomap.iomap_bn != IOMAP_DADDR_NULL) {
page_buf_daddr_t bn; xfs_daddr_t bn;
loff_t delta; loff_t delta;
/* For unwritten extents do not report a disk address on /* For unwritten extents do not report a disk address on
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7