diff options
author | Adrian Bunk <bunk@kernel.org> | 2008-02-19 14:44:19 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-19 18:52:27 -0500 |
commit | e03f1a842287480aa03732612148c0d333baca61 (patch) | |
tree | b26375cd9efb5d5ff3be1696b8bb59059f7eb92e /drivers/md/dm-raid1.c | |
parent | ae5e1b6cc511b278ad52b2d42afb44780e5d4cb2 (diff) |
dm-raid1.c: fix NULL dereferences
This patch fixes two NULL dereferences introduced by commit
06386bbfd2441416875d0403d405c56822f6ebac and spotted by the Coverity
checker.
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/md/dm-raid1.c')
-rw-r--r-- | drivers/md/dm-raid1.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c index 2928ef228101..51605870f898 100644 --- a/drivers/md/dm-raid1.c +++ b/drivers/md/dm-raid1.c | |||
@@ -1695,14 +1695,15 @@ static int mirror_end_io(struct dm_target *ti, struct bio *bio, | |||
1695 | * information for a retry or there was no other | 1695 | * information for a retry or there was no other |
1696 | * mirror in-sync. | 1696 | * mirror in-sync. |
1697 | */ | 1697 | */ |
1698 | DMERR_LIMIT("Mirror read failed from %s.", | 1698 | DMERR_LIMIT("Mirror read failed."); |
1699 | m->dev->name); | ||
1700 | return -EIO; | 1699 | return -EIO; |
1701 | } | 1700 | } |
1701 | |||
1702 | m = read_record->m; | ||
1703 | |||
1702 | DMERR("Mirror read failed from %s. Trying alternative device.", | 1704 | DMERR("Mirror read failed from %s. Trying alternative device.", |
1703 | m->dev->name); | 1705 | m->dev->name); |
1704 | 1706 | ||
1705 | m = read_record->m; | ||
1706 | fail_mirror(m, DM_RAID1_READ_ERROR); | 1707 | fail_mirror(m, DM_RAID1_READ_ERROR); |
1707 | 1708 | ||
1708 | /* | 1709 | /* |