diff options
author | NeilBrown <neilb@suse.de> | 2012-10-10 22:50:12 -0400 |
---|---|---|
committer | NeilBrown <neilb@suse.de> | 2012-10-10 22:50:12 -0400 |
commit | b97390aec4756373168ad2976e1f117b610513ea (patch) | |
tree | bf800dcf15dd08774d2da161d6317294727d8e2c /drivers | |
parent | 143c4d0573caebe0ae017097614349697e2280eb (diff) |
md/raid5: protect debug message against NULL derefernce.
The pr_debug in add_stripe_bio could race with something
changing *bip, so it is best to hold the lock until
after the pr_debug.
Reported-by: "Jianpeng Ma" <majianpeng@gmail.com>
Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/md/raid5.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index 36c0a158730b..d11012604e28 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c | |||
@@ -2436,11 +2436,11 @@ static int add_stripe_bio(struct stripe_head *sh, struct bio *bi, int dd_idx, in | |||
2436 | if (sector >= sh->dev[dd_idx].sector + STRIPE_SECTORS) | 2436 | if (sector >= sh->dev[dd_idx].sector + STRIPE_SECTORS) |
2437 | set_bit(R5_OVERWRITE, &sh->dev[dd_idx].flags); | 2437 | set_bit(R5_OVERWRITE, &sh->dev[dd_idx].flags); |
2438 | } | 2438 | } |
2439 | spin_unlock_irq(&sh->stripe_lock); | ||
2440 | 2439 | ||
2441 | pr_debug("added bi b#%llu to stripe s#%llu, disk %d.\n", | 2440 | pr_debug("added bi b#%llu to stripe s#%llu, disk %d.\n", |
2442 | (unsigned long long)(*bip)->bi_sector, | 2441 | (unsigned long long)(*bip)->bi_sector, |
2443 | (unsigned long long)sh->sector, dd_idx); | 2442 | (unsigned long long)sh->sector, dd_idx); |
2443 | spin_unlock_irq(&sh->stripe_lock); | ||
2444 | 2444 | ||
2445 | if (conf->mddev->bitmap && firstwrite) { | 2445 | if (conf->mddev->bitmap && firstwrite) { |
2446 | bitmap_startwrite(conf->mddev->bitmap, sh->sector, | 2446 | bitmap_startwrite(conf->mddev->bitmap, sh->sector, |