diff options
author | Josef Bacik <josef@redhat.com> | 2010-03-19 14:07:23 -0400 |
---|---|---|
committer | Chris Mason <chris.mason@oracle.com> | 2010-03-30 21:19:09 -0400 |
commit | 287a0ab91d25ca982f895a76402e5893b47ed7a6 (patch) | |
tree | fcbe35daef2b4cbdc2bfc0c6026e7c45faef0245 /fs/btrfs/extent-tree.c | |
parent | 1b1d1f6625e517a08640ddb4b8f8a0e025243fe3 (diff) |
Btrfs: kill max_extent mount option
As Yan pointed out, theres not much reason for all this complicated math to
account for file extents being split up into max_extent chunks, since they are
likely to all end up in the same leaf anyway. Since there isn't much reason to
use max_extent, just remove the option altogether so we have one less thing we
need to test.
Signed-off-by: Josef Bacik <josef@redhat.com>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/extent-tree.c')
-rw-r--r-- | fs/btrfs/extent-tree.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index 4c910359c807..5f6bc283c0c8 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c | |||
@@ -2846,7 +2846,7 @@ int btrfs_unreserve_metadata_for_delalloc(struct btrfs_root *root, | |||
2846 | } | 2846 | } |
2847 | spin_unlock(&BTRFS_I(inode)->accounting_lock); | 2847 | spin_unlock(&BTRFS_I(inode)->accounting_lock); |
2848 | 2848 | ||
2849 | BTRFS_I(inode)->reserved_extents--; | 2849 | BTRFS_I(inode)->reserved_extents -= num_items; |
2850 | BUG_ON(BTRFS_I(inode)->reserved_extents < 0); | 2850 | BUG_ON(BTRFS_I(inode)->reserved_extents < 0); |
2851 | 2851 | ||
2852 | if (meta_sinfo->bytes_delalloc < num_bytes) { | 2852 | if (meta_sinfo->bytes_delalloc < num_bytes) { |
@@ -3111,7 +3111,7 @@ again: | |||
3111 | return -ENOSPC; | 3111 | return -ENOSPC; |
3112 | } | 3112 | } |
3113 | 3113 | ||
3114 | BTRFS_I(inode)->reserved_extents++; | 3114 | BTRFS_I(inode)->reserved_extents += num_items; |
3115 | check_force_delalloc(meta_sinfo); | 3115 | check_force_delalloc(meta_sinfo); |
3116 | spin_unlock(&meta_sinfo->lock); | 3116 | spin_unlock(&meta_sinfo->lock); |
3117 | 3117 | ||