Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f5266cbd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents a5bc92cd c8a4051c

fs/xfs/linux-2.6/xfs_aops.c

+8 −0
Original line number Diff line number Diff line
@@ -1268,6 +1268,14 @@ xfs_vm_writepage( 
	if (!page_has_buffers(page))

		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

	 * to real space and flush out to disk.

fs/xfs/linux-2.6/xfs_iops.c

+2 −2
Original line number Diff line number Diff line
@@ -680,8 +680,8 @@ xfs_vn_fiemap( 
	else

		bm.bmv_length = BTOBB(length);



	/* our formatter will tell xfs_getbmap when to stop. */

	bm.bmv_count = MAXEXTNUM;

	/* We add one because in getbmap world count includes the header */

	bm.bmv_count = fieinfo->fi_extents_max + 1;

	bm.bmv_iflags = BMV_IF_PREALLOC;

	if (fieinfo->fi_flags & FIEMAP_FLAG_XATTR)

		bm.bmv_iflags |= BMV_IF_ATTRFORK;