diff options
| author | Chris Mason <chris.mason@oracle.com> | 2009-05-18 16:41:58 +0200 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2009-06-10 17:29:48 +0200 |
| commit | 585ad2c3797dcaa643aeba75b9f072778adf3490 (patch) | |
| tree | 4d48ff8f61f81a84bc620eb59215e1273f788d35 /fs/btrfs | |
| parent | Btrfs: reduce mount -o ssd CPU usage (diff) | |
| download | linux-585ad2c3797dcaa643aeba75b9f072778adf3490.tar.xz linux-585ad2c3797dcaa643aeba75b9f072778adf3490.zip | |
Btrfs: fix metadata dirty throttling limits
Once a metadata block has been written, it must be recowed, so the
btrfs dirty balancing call has a check to make sure a fair amount of metadata
was actually dirty before it started writing it back to disk.
A previous commit had changed the dirty tracking for metadata without
updating the btrfs dirty balancing checks. This commit switches it
to use the correct counter.
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs')
| -rw-r--r-- | fs/btrfs/disk-io.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 7f5c6e3e9992..e572cf478a5d 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -2378,17 +2378,14 @@ void btrfs_btree_balance_dirty(struct btrfs_root *root, unsigned long nr) * looks as though older kernels can get into trouble with * this code, they end up stuck in balance_dirty_pages forever */ - struct extent_io_tree *tree; u64 num_dirty; - u64 start = 0; unsigned long thresh = 32 * 1024 * 1024; - tree = &BTRFS_I(root->fs_info->btree_inode)->io_tree; if (current->flags & PF_MEMALLOC) return; - num_dirty = count_range_bits(tree, &start, (u64)-1, - thresh, EXTENT_DIRTY); + num_dirty = root->fs_info->dirty_metadata_bytes; + if (num_dirty > thresh) { balance_dirty_pages_ratelimited_nr( root->fs_info->btree_inode->i_mapping, 1); |