summaryrefslogtreecommitdiffstats
path: root/fs/btrfs
diff options
context:
space:
mode:
authorJeff Mahoney2017-06-22 15:51:47 +0200
committerDavid Sterba2017-08-16 16:12:05 +0200
commitf44d2287d2879f50b921e909b2377d6dcba3e251 (patch)
tree2d892e37dc250abeb5ea43b0329b38c7f22485df /fs/btrfs
parentbtrfs: prepare for extensions in compression options (diff)
downloadkernel-qcow2-linux-f44d2287d2879f50b921e909b2377d6dcba3e251.tar.gz
kernel-qcow2-linux-f44d2287d2879f50b921e909b2377d6dcba3e251.tar.xz
kernel-qcow2-linux-f44d2287d2879f50b921e909b2377d6dcba3e251.zip
btrfs: account for pinned bytes in should_alloc_chunk
In a heavy write scenario, we can end up with a large number of pinned bytes. This can translate into (very) premature ENOSPC because pinned bytes must be accounted for when allowing a reservation but aren't accounted for when deciding whether to create a new chunk. This patch adds the accounting to should_alloc_chunk so that we can create the chunk. Signed-off-by: Jeff Mahoney <jeffm@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs')
-rw-r--r--fs/btrfs/extent-tree.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 7d7abc0d47b9..b929fe201981 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -4419,7 +4419,7 @@ static int should_alloc_chunk(struct btrfs_fs_info *fs_info,
{
struct btrfs_block_rsv *global_rsv = &fs_info->global_block_rsv;
u64 num_bytes = sinfo->total_bytes - sinfo->bytes_readonly;
- u64 num_allocated = sinfo->bytes_used + sinfo->bytes_reserved;
+ u64 num_allocated = sinfo->bytes_used + sinfo->bytes_reserved + sinfo->bytes_pinned;
u64 thresh;
if (force == CHUNK_ALLOC_FORCE)