diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-01-30 17:25:52 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-01-30 17:25:52 -0500 |
| commit | bc208e0ee0f46744aac95c29366144271a6962bb (patch) | |
| tree | d7336b6026ef51bf987273c1dc9c0a374052e5d8 /fs | |
| parent | 92ef9ce301ed98b2b963d2f3c5367904efc69fba (diff) | |
| parent | 063c54dccdecb0479662778ddf54ee45aa55423d (diff) | |
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
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/scrub.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c index 2f0fbc374e87..e427cb7ee12c 100644 --- a/fs/btrfs/scrub.c +++ b/fs/btrfs/scrub.c | |||
| @@ -3065,6 +3065,8 @@ static noinline_for_stack int scrub_stripe(struct scrub_ctx *sctx, | |||
| 3065 | path->search_commit_root = 1; | 3065 | path->search_commit_root = 1; |
| 3066 | path->skip_locking = 1; | 3066 | path->skip_locking = 1; |
| 3067 | 3067 | ||
| 3068 | ppath->search_commit_root = 1; | ||
| 3069 | ppath->skip_locking = 1; | ||
| 3068 | /* | 3070 | /* |
| 3069 | * trigger the readahead for extent tree csum tree and wait for | 3071 | * trigger the readahead for extent tree csum tree and wait for |
| 3070 | * completion. During readahead, the scrub is officially paused | 3072 | * completion. During readahead, the scrub is officially paused |