Commit 7c4c71ac authored by Chris Mason's avatar Chris Mason

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 a23eaa87.
Signed-off-by: default avatarChris Mason <clm@fb.com>
parent e5d6b12f
...@@ -7765,12 +7765,10 @@ static int btrfs_get_blocks_direct(struct inode *inode, sector_t iblock, ...@@ -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 * this will cow the extent, reset the len in case we changed
* probably we've found a preallocated/existing extent, let's * it above
* give it a chance to use preallocated space.
*/ */
len = min_t(u64, bh_result->b_size, em->len - (start - em->start)); len = bh_result->b_size;
len = ALIGN(len, fs_info->sectorsize);
free_extent_map(em); free_extent_map(em);
em = btrfs_new_extent_direct(inode, start, len); em = btrfs_new_extent_direct(inode, start, len);
if (IS_ERR(em)) { if (IS_ERR(em)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment