Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs

bc208e0e · Linus Torvalds <[email protected]> · 2015-01-30 14:25:52 -08:00

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

Commit: bc208e0ee0f46744aac95c29366144271a6962bb
Parents: 92ef9ce3 · 063c54dc

Merge commit. Changes below are compared with the first parent: 92ef9ce3.

Changes

1 files changed · +2 −0

File	Status	Add	Del	Content
fs/btrfs/scrub.c	modified	+2	−0	View file

fs/btrfs/scrub.c

View file

diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c
index 2f0fbc3..e427cb7 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,
 	path->search_commit_root = 1;
 	path->skip_locking = 1;
 
+	ppath->search_commit_root = 1;
+	ppath->skip_locking = 1;
 	/*
 	 * trigger the readahead for extent tree csum tree and wait for
 	 * completion. During readahead, the scrub is officially paused