diff options
| author | Chris Mason <chris.mason@oracle.com> | 2009-04-24 14:39:24 -0400 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2009-04-24 15:46:05 -0400 |
| commit | e980b50cda1610f1c17978d9b7fd311a9dd93877 (patch) | |
| tree | a5ab72fa4b791758e25fd6ece6f1aedd29954e7b /fs/btrfs/tree-log.c | |
| parent | 9601e3f6336f6ca66929f451b1f66085e68e36e3 (diff) | |
| download | kernel-crypto-e980b50cda1610f1c17978d9b7fd311a9dd93877.tar.gz kernel-crypto-e980b50cda1610f1c17978d9b7fd311a9dd93877.tar.xz kernel-crypto-e980b50cda1610f1c17978d9b7fd311a9dd93877.zip | |
Btrfs: fix fallocate deadlock on inode extent lock
The btrfs fallocate call takes an extent lock on the entire range
being fallocated, and then runs through insert_reserved_extent on each
extent as they are allocated.
The problem with this is that btrfs_drop_extents may decide to try
and take the same extent lock fallocate was already holding. The solution
used here is to push down knowledge of the range that is already locked
going into btrfs_drop_extents.
It turns out that at least one other caller had the same bug.
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/tree-log.c')
| -rw-r--r-- | fs/btrfs/tree-log.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c index 25f20ea11f2..db5e212e844 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c @@ -536,7 +536,7 @@ static noinline int replay_one_extent(struct btrfs_trans_handle *trans, saved_nbytes = inode_get_bytes(inode); /* drop any overlapping extents */ ret = btrfs_drop_extents(trans, root, inode, - start, extent_end, start, &alloc_hint); + start, extent_end, extent_end, start, &alloc_hint); BUG_ON(ret); if (found_type == BTRFS_FILE_EXTENT_REG || |