aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMikulas Patocka <mpatocka@redhat.com>2012-12-21 15:23:32 -0500
committerAlasdair G Kergon <agk@redhat.com>2012-12-21 15:23:32 -0500
commit7c27213b20f060111d5b6fa14bcdbab6588ae351 (patch)
tree2500a6e11d141c83bf6f22df62b93cc015a9ea99 /drivers
parent018debea8de9b8f17a9637e07c98c61517eb2a6b (diff)
dm raid1: remove impossible mempool_alloc error test
mempool_alloc can't fail if __GFP_WAIT is specified, so the condition that tests if read_record is non-NULL is always true. Signed-off-by: Mikulas Patocka <mpatocka@redhat.com> Signed-off-by: Alasdair G Kergon <agk@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/md/dm-raid1.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c
index fd61f98ee1f6..b37467618b16 100644
--- a/drivers/md/dm-raid1.c
+++ b/drivers/md/dm-raid1.c
@@ -1195,11 +1195,9 @@ static int mirror_map(struct dm_target *ti, struct bio *bio,
1195 return -EIO; 1195 return -EIO;
1196 1196
1197 read_record = mempool_alloc(ms->read_record_pool, GFP_NOIO); 1197 read_record = mempool_alloc(ms->read_record_pool, GFP_NOIO);
1198 if (likely(read_record)) { 1198 dm_bio_record(&read_record->details, bio);
1199 dm_bio_record(&read_record->details, bio); 1199 map_context->ptr = read_record;
1200 map_context->ptr = read_record; 1200 read_record->m = m;
1201 read_record->m = m;
1202 }
1203 1201
1204 map_bio(m, bio); 1202 map_bio(m, bio);
1205 1203