diff options
| author | Christoph Hellwig | 2019-06-29 04:27:19 +0200 |
|---|---|---|
| committer | Darrick J. Wong | 2019-06-29 04:27:19 +0200 |
| commit | 72945d86ddec143ee5064f36eae4b48b03ea1a3f (patch) | |
| tree | 971c0ac3ccbecfec6aac4086a9f45848f680d6fd /fs/xfs | |
| parent | xfs: renumber XBF_WRITE_FAIL (diff) | |
| download | kernel-qcow2-linux-72945d86ddec143ee5064f36eae4b48b03ea1a3f.tar.gz kernel-qcow2-linux-72945d86ddec143ee5064f36eae4b48b03ea1a3f.tar.xz kernel-qcow2-linux-72945d86ddec143ee5064f36eae4b48b03ea1a3f.zip | |
xfs: make mem_to_page available outside of xfs_buf.c
Rename the function to kmem_to_page and move it to kmem.h together
with our kmem_large allocator that may either return kmalloced or
vmalloc pages.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Diffstat (limited to 'fs/xfs')
| -rw-r--r-- | fs/xfs/kmem.h | 8 | ||||
| -rw-r--r-- | fs/xfs/xfs_buf.c | 13 |
2 files changed, 9 insertions, 12 deletions
diff --git a/fs/xfs/kmem.h b/fs/xfs/kmem.h index 8e6b3ba81c03..267655acd426 100644 --- a/fs/xfs/kmem.h +++ b/fs/xfs/kmem.h @@ -124,4 +124,12 @@ kmem_zone_zalloc(kmem_zone_t *zone, xfs_km_flags_t flags) return kmem_zone_alloc(zone, flags | KM_ZERO); } +static inline struct page * +kmem_to_page(void *addr) +{ + if (is_vmalloc_addr(addr)) + return vmalloc_to_page(addr); + return virt_to_page(addr); +} + #endif /* __XFS_SUPPORT_KMEM_H__ */ diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c index e860114e8c9b..f455995f9278 100644 --- a/fs/xfs/xfs_buf.c +++ b/fs/xfs/xfs_buf.c @@ -934,17 +934,6 @@ xfs_buf_set_empty( bp->b_maps[0].bm_len = bp->b_length; } -static inline struct page * -mem_to_page( - void *addr) -{ - if ((!is_vmalloc_addr(addr))) { - return virt_to_page(addr); - } else { - return vmalloc_to_page(addr); - } -} - int xfs_buf_associate_memory( xfs_buf_t *bp, @@ -977,7 +966,7 @@ xfs_buf_associate_memory( bp->b_offset = offset; for (i = 0; i < bp->b_page_count; i++) { - bp->b_pages[i] = mem_to_page((void *)pageaddr); + bp->b_pages[i] = kmem_to_page((void *)pageaddr); pageaddr += PAGE_SIZE; } |