diff options
| author | Josef Bacik <josef@redhat.com> | 2011-09-11 10:52:24 -0400 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2011-09-11 10:52:24 -0400 |
| commit | ddf23b3fc6850bd4654d51ec9457fe7c77cde51e (patch) | |
| tree | 9f5fe8f71a2793b5f651ef6c535d9116b5094348 /fs | |
| parent | e0b6d65be57fb37ca67b04ce8964546a74d2125c (diff) | |
| download | linux-stable-ddf23b3fc6850bd4654d51ec9457fe7c77cde51e.tar.gz linux-stable-ddf23b3fc6850bd4654d51ec9457fe7c77cde51e.tar.bz2 linux-stable-ddf23b3fc6850bd4654d51ec9457fe7c77cde51e.zip | |
Btrfs: skip locking if searching the commit root in csum lookup
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,
Signed-off-by: Josef Bacik <josef@redhat.com>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/file-item.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/btrfs/file-item.c b/fs/btrfs/file-item.c index b910694f61ed..a1cb7821becd 100644 --- a/fs/btrfs/file-item.c +++ b/fs/btrfs/file-item.c @@ -183,8 +183,10 @@ static int __btrfs_lookup_bio_sums(struct btrfs_root *root, * read from the commit root and sidestep a nasty deadlock * between reading the free space cache and updating the csum tree. */ - if (btrfs_is_free_space_inode(root, inode)) + if (btrfs_is_free_space_inode(root, inode)) { path->search_commit_root = 1; + path->skip_locking = 1; + } disk_bytenr = (u64)bio->bi_sector << 9; if (dio) |