diff options
| author | Felix Blyakher <felixb@sgi.com> | 2009-02-18 15:41:28 -0600 |
|---|---|---|
| committer | Felix Blyakher <felixb@sgi.com> | 2009-02-19 13:15:44 -0600 |
| commit | 7fdf582447aa01658b624adc0a51a31e4278b68c (patch) | |
| tree | dcb0df49afe80e241f470d3850a6bea6c2c0c596 /fs | |
| parent | 43f3f057c56d030546145696627f13f95735be95 (diff) | |
| download | linux-3.10-7fdf582447aa01658b624adc0a51a31e4278b68c.tar.gz linux-3.10-7fdf582447aa01658b624adc0a51a31e4278b68c.tar.bz2 linux-3.10-7fdf582447aa01658b624adc0a51a31e4278b68c.zip | |
Revert "[XFS] use scalable vmap API"
This reverts commit 95f8e302c04c0b0c6de35ab399a5551605eeb006.
This commit caused regression. We'll try to fix use of new
vmap API for next release.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Felix Blyakher <felixb@sgi.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_buf.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/xfs/linux-2.6/xfs_buf.c b/fs/xfs/linux-2.6/xfs_buf.c index d71dc44e21e..0b2177a9fbd 100644 --- a/fs/xfs/linux-2.6/xfs_buf.c +++ b/fs/xfs/linux-2.6/xfs_buf.c @@ -264,7 +264,7 @@ xfs_buf_free( uint i; if ((bp->b_flags & XBF_MAPPED) && (bp->b_page_count > 1)) - vm_unmap_ram(bp->b_addr - bp->b_offset, bp->b_page_count); + vunmap(bp->b_addr - bp->b_offset); for (i = 0; i < bp->b_page_count; i++) { struct page *page = bp->b_pages[i]; @@ -386,8 +386,8 @@ _xfs_buf_map_pages( bp->b_addr = page_address(bp->b_pages[0]) + bp->b_offset; bp->b_flags |= XBF_MAPPED; } else if (flags & XBF_MAPPED) { - bp->b_addr = vm_map_ram(bp->b_pages, bp->b_page_count, - -1, PAGE_KERNEL); + bp->b_addr = vmap(bp->b_pages, bp->b_page_count, + VM_MAP, PAGE_KERNEL); if (unlikely(bp->b_addr == NULL)) return -ENOMEM; bp->b_addr += bp->b_offset; |