diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-31 07:53:43 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-31 07:53:43 -0400 |
| commit | 7bee946358c3cb957d4aa648fc5ab3cad0b232d0 (patch) | |
| tree | 693061ebde2abc35ecc846e5084630d7225aaaff /fs/btrfs/disk-io.c | |
| parent | d820ac4c2fa881079e6b689d2098adce337558ae (diff) | |
| parent | 15f7176eb1cccec0a332541285ee752b935c1c85 (diff) | |
Merge branch 'linus' into locking-for-linus
Conflicts:
lib/Kconfig.debug
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 3e18175248e0..6ec80c0fc869 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c | |||
| @@ -2385,7 +2385,7 @@ void btrfs_btree_balance_dirty(struct btrfs_root *root, unsigned long nr) | |||
| 2385 | unsigned long thresh = 32 * 1024 * 1024; | 2385 | unsigned long thresh = 32 * 1024 * 1024; |
| 2386 | tree = &BTRFS_I(root->fs_info->btree_inode)->io_tree; | 2386 | tree = &BTRFS_I(root->fs_info->btree_inode)->io_tree; |
| 2387 | 2387 | ||
| 2388 | if (current_is_pdflush() || current->flags & PF_MEMALLOC) | 2388 | if (current->flags & PF_MEMALLOC) |
| 2389 | return; | 2389 | return; |
| 2390 | 2390 | ||
| 2391 | num_dirty = count_range_bits(tree, &start, (u64)-1, | 2391 | num_dirty = count_range_bits(tree, &start, (u64)-1, |