diff options
author | Josef Bacik <josef@redhat.com> | 2009-09-11 16:12:44 -0400 |
---|---|---|
committer | Chris Mason <chris.mason@oracle.com> | 2009-09-28 16:29:42 -0400 |
commit | 9ed74f2dba6ebf9f30b80554290bfc73cc3ef083 (patch) | |
tree | 763d58a4a11ceca26dcdaedefb1fd662c4e2fa8b /fs/btrfs/disk-io.c | |
parent | c65ddb52dc412c9b67681b1aa16cd1bac8434e24 (diff) |
Btrfs: proper -ENOSPC handling
At the start of a transaction we do a btrfs_reserve_metadata_space() and
specify how many items we plan on modifying. Then once we've done our
modifications and such, just call btrfs_unreserve_metadata_space() for
the same number of items we reserved.
For keeping track of metadata needed for data I've had to add an extent_io op
for when we merge extents. This lets us track space properly when we are doing
sequential writes, so we don't end up reserving way more metadata space than
what we need.
The only place where the metadata space accounting is not done is in the
relocation code. This is because Yan is going to be reworking that code in the
near future, so running btrfs-vol -b could still possibly result in a ENOSPC
related panic. This patch also turns off the metadata_ratio stuff in order to
allow users to more efficiently use their disk space.
This patch makes it so we track how much metadata we need for an inode's
delayed allocation extents by tracking how many extents are currently
waiting for allocation. It introduces two new callbacks for the
extent_io tree's, merge_extent_hook and split_extent_hook. These help
us keep track of when we merge delalloc extents together and split them
up. Reservations are handled prior to any actually dirty'ing occurs,
and then we unreserve after we dirty.
btrfs_unreserve_metadata_for_delalloc() will make the appropriate
unreservations as needed based on the number of reservations we
currently have and the number of extents we currently have. Doing the
reservation outside of doing any of the actual dirty'ing lets us do
things like filemap_flush() the inode to try and force delalloc to
happen, or as a last resort actually start allocation on all delalloc
inodes in the fs. This has survived dbench, fs_mark and an fsx torture
test.
Signed-off-by: Josef Bacik <jbacik@redhat.com>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/disk-io.c')
-rw-r--r-- | fs/btrfs/disk-io.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index f1e905f7e701..ece8d1e26b5e 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c | |||
@@ -1629,7 +1629,7 @@ struct btrfs_root *open_ctree(struct super_block *sb, | |||
1629 | fs_info->sb = sb; | 1629 | fs_info->sb = sb; |
1630 | fs_info->max_extent = (u64)-1; | 1630 | fs_info->max_extent = (u64)-1; |
1631 | fs_info->max_inline = 8192 * 1024; | 1631 | fs_info->max_inline = 8192 * 1024; |
1632 | fs_info->metadata_ratio = 8; | 1632 | fs_info->metadata_ratio = 0; |
1633 | 1633 | ||
1634 | fs_info->thread_pool_size = min_t(unsigned long, | 1634 | fs_info->thread_pool_size = min_t(unsigned long, |
1635 | num_online_cpus() + 2, 8); | 1635 | num_online_cpus() + 2, 8); |