p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Btrfs: adjust len of writes if following a preallocated extent" 

This is exposing an existing deadlock between fsync and AIO.  Until we
have the deadlock fixed, I'm pulling this one out.

This reverts commit a23eaa875f.

Signed-off-by: Chris Mason <clm@fb.com>
This commit is contained in:
Chris Mason 2016-12-08 17:55:03 -08:00
parent e5d6b12fe1
commit 7c4c71ac8a
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fs/btrfs/inode.c
View File

@ -7765,12 +7765,10 @@ static int btrfs_get_blocks_direct(struct inode *inode, sector_t iblock,
}
/*
* this will cow the extent, if em is within [start, len], then
* probably we've found a preallocated/existing extent, let's
* give it a chance to use preallocated space.
* this will cow the extent, reset the len in case we changed
* it above
*/
len = min_t(u64, bh_result->b_size, em->len - (start - em->start));
len = ALIGN(len, fs_info->sectorsize);
len = bh_result->b_size;
free_extent_map(em);
em = btrfs_new_extent_direct(inode, start, len);
if (IS_ERR(em)) {