Commit bc208e0ee0f46744aac95c29366144271a6962bb
Exists in
ti-lsk-linux-4.1.y
and in
10 other branches
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
Pull btrfs fix from Chris Mason: "We have one more fix for btrfs in my for-linus branch - this was a bug in the new raid5/6 scrubbing support" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: btrfs: fix raid56 scrub failed in xfstests btrfs/072
Showing 1 changed file Side-by-side Diff
fs/btrfs/scrub.c
| ... | ... | @@ -3065,6 +3065,8 @@ |
| 3065 | 3065 | path->search_commit_root = 1; |
| 3066 | 3066 | path->skip_locking = 1; |
| 3067 | 3067 | |
| 3068 | + ppath->search_commit_root = 1; | |
| 3069 | + ppath->skip_locking = 1; | |
| 3068 | 3070 | /* |
| 3069 | 3071 | * trigger the readahead for extent tree csum tree and wait for |
| 3070 | 3072 | * completion. During readahead, the scrub is officially paused |