diff options
| author | Josef Bacik <jbacik@fb.com> | 2016-05-27 13:24:13 -0400 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2016-07-07 18:45:53 +0200 |
| commit | 8ca17f0f59529df9e2132ca594ff00c52a9bc556 (patch) | |
| tree | 52539f2d8ab37e71a6115cc1dab18ed2aeaa101c /fs/btrfs/extent-tree.c | |
| parent | ac2fabac4211431b607b326c2233e73b81e86af2 (diff) | |
| download | lwn-8ca17f0f59529df9e2132ca594ff00c52a9bc556.tar.gz lwn-8ca17f0f59529df9e2132ca594ff00c52a9bc556.zip | |
Btrfs: use FLUSH_LIMIT for relocation in reserve_metadata_bytes
We used to allow you to set FLUSH_ALL and then just wouldn't do things like
commit transactions or wait on ordered extents if we noticed you were in a
transaction. However now that all the flushing for FLUSH_ALL is asynchronous
we've lost the ability to tell, and we could end up deadlocking. So instead use
FLUSH_LIMIT in reserve_metadata_bytes in relocation and then return -EAGAIN if
we error out to preserve the previous behavior. I've also added an ASSERT() to
catch anybody else who tries to do this. Thanks,
Signed-off-by: Josef Bacik <jbacik@fb.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/extent-tree.c')
| -rw-r--r-- | fs/btrfs/extent-tree.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index f3de211173ad..3a129c42658e 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -5135,6 +5135,8 @@ static int __reserve_metadata_bytes(struct btrfs_root *root, int ret = 0; ASSERT(orig_bytes); + ASSERT(!current->journal_info || flush != BTRFS_RESERVE_FLUSH_ALL); + spin_lock(&space_info->lock); ret = -ENOSPC; used = space_info->bytes_used + space_info->bytes_reserved + |