diff options
| author | Ingo Molnar <mingo@kernel.org> | 2020-07-31 00:15:53 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2020-07-31 00:15:53 +0200 |
| commit | c1cc4784ce6e8cceff1013709abd74bcbf7fbf24 (patch) | |
| tree | 5eaacf62240ec85a6ad9c7594e8ad8f7f783afc2 /fs | |
| parent | 92ed301919932f777713b9172e525674157e983d (diff) | |
| parent | 13625c0a4074d3bab61b1dc70a828b574255f339 (diff) | |
| download | lwn-c1cc4784ce6e8cceff1013709abd74bcbf7fbf24.tar.gz lwn-c1cc4784ce6e8cceff1013709abd74bcbf7fbf24.zip | |
Merge branch 'for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/rcu
Pull the v5.9 RCU bits from Paul E. McKenney:
- Documentation updates
- Miscellaneous fixes
- kfree_rcu updates
- RCU tasks updates
- Read-side scalability tests
- SRCU updates
- Torture-test updates
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/extent_io.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index 60278e52c37a..eeaee346f5a9 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -4516,6 +4516,8 @@ int try_release_extent_mapping(struct page *page, gfp_t mask) /* once for us */ free_extent_map(em); + + cond_resched(); /* Allow large-extent preemption. */ } } return try_release_extent_state(tree, page, mask); |