diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-18 19:46:21 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-18 19:46:21 -0400 |
| commit | bdeeab62a611f1f7cd48fd285ce568e8dcd0455a (patch) | |
| tree | 93e5e16b5ef769093dca6cb23e44b83433f4b688 /fs | |
| parent | 797afdf70844c719d229174c460687fb17af9762 (diff) | |
| parent | 1bda19eb73d68b304148e67253e47cef049a419d (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
Pull btrfs fix from Chris Mason:
"Sage hit a deadlock with ceph on btrfs, and Josef tracked it down to a
regression in our initial rc1 pull. When doing nocow writes we were
sometimes starting a transaction with locks held"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
Btrfs: release path before starting transaction in can_nocow_extent
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/inode.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index b0ef7b07b1b3..51e3afa78354 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c | |||
| @@ -6437,6 +6437,7 @@ noinline int can_nocow_extent(struct inode *inode, u64 offset, u64 *len, | |||
| 6437 | 6437 | ||
| 6438 | if (btrfs_extent_readonly(root, disk_bytenr)) | 6438 | if (btrfs_extent_readonly(root, disk_bytenr)) |
| 6439 | goto out; | 6439 | goto out; |
| 6440 | btrfs_release_path(path); | ||
| 6440 | 6441 | ||
| 6441 | /* | 6442 | /* |
| 6442 | * look for other files referencing this extent, if we | 6443 | * look for other files referencing this extent, if we |