It's not enough to just search the commit root, since we could be cow'ing the very block we need to search through, which would mean that its locked and we'll still deadlock. So use path->skip_locking as well. Thanks,
Unified · Split
| @@ -183,8 +183,10 @@ static int __btrfs_lookup_bio_sums(struct btrfs_root *root, · 182 unmodified lines | |||
| 183 | * read from the commit root and sidestep a nasty deadlock | 183 | * read from the commit root and sidestep a nasty deadlock |
| 184 | * between reading the free space cache and updating the csum tree. | 184 | * between reading the free space cache and updating the csum tree. |
| 185 | */ | 185 | */ |
| 186 | if (btrfs_is_free_space_inode(root, inode)) | 186 | if (btrfs_is_free_space_inode(root, inode)) { |
| 187 | path->search_commit_root = 1; | 187 | path->search_commit_root = 1; |
| 188 | path->skip_locking = 1; | ||
| 189 | } | ||
| 188 | 190 | ||
| 189 | disk_bytenr = (u64)bio->bi_sector << 9; | 191 | disk_bytenr = (u64)bio->bi_sector << 9; |
| 190 | if (dio) | 192 | if (dio) |