git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'writeback-for-linus' of git://github.com/fengguang/linux
[pandora-kernel.git]
/
drivers
/
md
/
raid5.c
diff --git
a/drivers/md/raid5.c
b/drivers/md/raid5.c
index
dbae459
..
43709fa
100644
(file)
--- a/
drivers/md/raid5.c
+++ b/
drivers/md/raid5.c
@@
-3336,7
+3336,7
@@
static void handle_stripe(struct stripe_head *sh)
finish:
/* wait for this device to become unblocked */
finish:
/* wait for this device to become unblocked */
- if (unlikely(s.blocked_rdev))
+ if (
conf->mddev->external &&
unlikely(s.blocked_rdev))
md_wait_for_blocked_rdev(s.blocked_rdev, conf->mddev);
if (s.handle_bad_blocks)
md_wait_for_blocked_rdev(s.blocked_rdev, conf->mddev);
if (s.handle_bad_blocks)