diff options
| author | Josef Bacik <jbacik@fusionio.com> | 2013-06-14 16:58:23 -0400 |
|---|---|---|
| committer | Josef Bacik <jbacik@fusionio.com> | 2013-07-01 08:52:31 -0400 |
| commit | fdf8e2ea3cba9ef03087482b11258d844d6cbea3 (patch) | |
| tree | 2f20fdf4838107803e69cf27c4bbcc543159b2c9 /fs/btrfs | |
| parent | 90b6d2830a72ff008c9bbc8dfbf7aaec90be458f (diff) | |
| download | op-kernel-dev-fdf8e2ea3cba9ef03087482b11258d844d6cbea3.zip op-kernel-dev-fdf8e2ea3cba9ef03087482b11258d844d6cbea3.tar.gz | |
Btrfs: unlock extent range on enospc in compressed submit
A user reported a deadlock where the async submit thread was blocked on the
lock_extent() lock, and then everybody behind him was locked on the page lock
for the page he was holding. Looking at the code I noticed we do not unlock the
extent range when we get ENOSPC and goto retry. This is bad because we
immediately try to lock that range again to do the cow, which will cause a
deadlock. Fix this by unlocking the range. Thanks,
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
Diffstat (limited to 'fs/btrfs')
| -rw-r--r-- | fs/btrfs/inode.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index a2df469..509112d 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -700,8 +700,12 @@ retry: async_extent->nr_pages = 0; async_extent->pages = NULL; - if (ret == -ENOSPC) + if (ret == -ENOSPC) { + unlock_extent(io_tree, async_extent->start, + async_extent->start + + async_extent->ram_size - 1); goto retry; + } goto out_free; } |
