Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
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
+8
fs/xfs/linux-2.6/xfs_aops.c
+8
fs/xfs/linux-2.6/xfs_aops.c
···
1268
1268
if (!page_has_buffers(page))
1269
1269
create_empty_buffers(page, 1 << inode->i_blkbits, 0);
1270
1270
1271
+
1272
+
/*
1273
+
* VM calculation for nr_to_write seems off. Bump it way
1274
+
* up, this gets simple streaming writes zippy again.
1275
+
* To be reviewed again after Jens' writeback changes.
1276
+
*/
1277
+
wbc->nr_to_write *= 4;
1278
+
1271
1279
/*
1272
1280
* Convert delayed allocate, unwritten or unmapped space
1273
1281
* to real space and flush out to disk.
+2
-2
fs/xfs/linux-2.6/xfs_iops.c
+2
-2
fs/xfs/linux-2.6/xfs_iops.c
···
680
680
else
681
681
bm.bmv_length = BTOBB(length);
682
682
683
-
/* our formatter will tell xfs_getbmap when to stop. */
684
-
bm.bmv_count = MAXEXTNUM;
683
+
/* We add one because in getbmap world count includes the header */
684
+
bm.bmv_count = fieinfo->fi_extents_max + 1;
685
685
bm.bmv_iflags = BMV_IF_PREALLOC;
686
686
if (fieinfo->fi_flags & FIEMAP_FLAG_XATTR)
687
687
bm.bmv_iflags |= BMV_IF_ATTRFORK;