diff options
| author |   Chris Mason <clm@fb.com> | 2015-03-25 10:43:16 -0700 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2015-03-25 10:43:16 -0700 |
| commit | 9deed229fa8a83bb5cd713b2d2a8e5c022a4b45b (patch) | |
| tree | a98200a7176d8066099fde32e9691c7c36f66b1e /fs/btrfs/transaction.c | |
| parent | Linux 4.0-rc5 (diff) | |
| parent | btrfs: remove shadowing variables in __btrfs_map_block (diff) | |
| download | linux-dev-9deed229fa8a83bb5cd713b2d2a8e5c022a4b45b.tar.xz linux-dev-9deed229fa8a83bb5cd713b2d2a8e5c022a4b45b.zip | |
Merge branch 'cleanups-for-4.1-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.1
Diffstat (limited to 'fs/btrfs/transaction.c')
| -rw-r--r-- | fs/btrfs/transaction.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c index 8be4278e25e8..fae816b6671d 100644 --- a/fs/btrfs/transaction.c +++ b/fs/btrfs/transaction.c @@ -93,11 +93,8 @@ static void clear_btree_io_tree(struct extent_io_tree *tree) */ ASSERT(!waitqueue_active(&state->wq)); free_extent_state(state); - if (need_resched()) { - spin_unlock(&tree->lock); - cond_resched(); - spin_lock(&tree->lock); - } + + cond_resched_lock(&tree->lock); } spin_unlock(&tree->lock); } |