diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-05-17 19:55:10 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-05-17 19:55:10 +0300 |
| commit | 8ac91e6c6033ebc12c5c1e4aa171b81a662bd70f (patch) | |
| tree | 9c31810666cf977e9c432a4a27137e15cf3280eb /fs/btrfs/inode.c | |
| parent | d07f6ca923ea0927a1024dfccafc5b53b61cfecc (diff) | |
| parent | 54a40fc3a1da21b52dbf19f72fdc27a2ec740760 (diff) | |
| download | linux-8ac91e6c6033ebc12c5c1e4aa171b81a662bd70f.tar.xz | |
Merge tag 'for-5.13-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux
Pull btrfs fixes from David Sterba:
"A few more fixes:
- fix fiemap to print extents that could get misreported due to
internal extent splitting and logical merging for fiemap output
- fix RCU stalls during delayed iputs
- fix removed dentries still existing after log is synced"
* tag 'for-5.13-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
btrfs: fix removed dentries still existing after log is synced
btrfs: return whole extents in fiemap
btrfs: avoid RCU stalls while running delayed iputs
btrfs: return 0 for dev_extent_hole_check_zoned hole_start in case of error
Diffstat (limited to 'fs/btrfs/inode.c')
| -rw-r--r-- | fs/btrfs/inode.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index eb6fddf40841..c6164ae16e2a 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -3241,6 +3241,7 @@ void btrfs_run_delayed_iputs(struct btrfs_fs_info *fs_info) inode = list_first_entry(&fs_info->delayed_iputs, struct btrfs_inode, delayed_iput); run_delayed_iput_locked(fs_info, inode); + cond_resched_lock(&fs_info->delayed_iput_lock); } spin_unlock(&fs_info->delayed_iput_lock); } |