mirror of
https://github.com/adulau/aha.git
synced 2024-12-28 11:46:19 +00:00
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
* 'for-linus' of git://oss.sgi.com/xfs/xfs: xfs: bump up nr_to_write in xfs_vm_writepage xfs: reduce bmv_count in xfs_vn_fiemap
This commit is contained in:
commit
f5266cbd2f
2 changed files with 10 additions and 2 deletions
|
@ -1268,6 +1268,14 @@ xfs_vm_writepage(
|
||||||
if (!page_has_buffers(page))
|
if (!page_has_buffers(page))
|
||||||
create_empty_buffers(page, 1 << inode->i_blkbits, 0);
|
create_empty_buffers(page, 1 << inode->i_blkbits, 0);
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
* VM calculation for nr_to_write seems off. Bump it way
|
||||||
|
* up, this gets simple streaming writes zippy again.
|
||||||
|
* To be reviewed again after Jens' writeback changes.
|
||||||
|
*/
|
||||||
|
wbc->nr_to_write *= 4;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Convert delayed allocate, unwritten or unmapped space
|
* Convert delayed allocate, unwritten or unmapped space
|
||||||
* to real space and flush out to disk.
|
* to real space and flush out to disk.
|
||||||
|
|
|
@ -680,8 +680,8 @@ xfs_vn_fiemap(
|
||||||
else
|
else
|
||||||
bm.bmv_length = BTOBB(length);
|
bm.bmv_length = BTOBB(length);
|
||||||
|
|
||||||
/* our formatter will tell xfs_getbmap when to stop. */
|
/* We add one because in getbmap world count includes the header */
|
||||||
bm.bmv_count = MAXEXTNUM;
|
bm.bmv_count = fieinfo->fi_extents_max + 1;
|
||||||
bm.bmv_iflags = BMV_IF_PREALLOC;
|
bm.bmv_iflags = BMV_IF_PREALLOC;
|
||||||
if (fieinfo->fi_flags & FIEMAP_FLAG_XATTR)
|
if (fieinfo->fi_flags & FIEMAP_FLAG_XATTR)
|
||||||
bm.bmv_iflags |= BMV_IF_ATTRFORK;
|
bm.bmv_iflags |= BMV_IF_ATTRFORK;
|
||||||
|
|
Loading…
Reference in a new issue