diff options
| author | majianpeng <majianpeng@gmail.com> | 2012-07-03 12:11:54 +1000 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2012-07-12 04:32:06 +0100 |
| commit | 6b295c456aff465a7710259b2a6b5f06e654f850 (patch) | |
| tree | f6e03168bb11bb817c19513b9b00b26e54156720 /drivers/md | |
| parent | ebfdf3076402b08d6fd97141ac40149ff13f70ea (diff) | |
md/raid5: In ops_run_io, inc nr_pending before calling md_wait_for_blocked_rdev
commit 1850753d2e6d9ca7856581ca5d3cf09521e6a5d7 upstream.
In ops_run_io(), the call to md_wait_for_blocked_rdev will decrement
nr_pending so we lose the reference we hold on the rdev.
So atomic_inc it first to maintain the reference.
This bug was introduced by commit 73e92e51b7969ef5477d
md/raid5. Don't write to known bad block on doubtful devices.
which appeared in 3.0, so patch is suitable for stable kernels since
then.
Signed-off-by: majianpeng <majianpeng@gmail.com>
Signed-off-by: NeilBrown <neilb@suse.de>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/md')
| -rw-r--r-- | drivers/md/raid5.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index d423c7eefb62..6ba4954b6f2a 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -542,6 +542,12 @@ static void ops_run_io(struct stripe_head *sh, struct stripe_head_state *s) * a chance*/ md_check_recovery(conf->mddev); } + /* + * Because md_wait_for_blocked_rdev + * will dec nr_pending, we must + * increment it first. + */ + atomic_inc(&rdev->nr_pending); md_wait_for_blocked_rdev(rdev, conf->mddev); } else { /* Acknowledged bad block - skip the write */ |