From 51fe403a3d01a9cab0bd5bc7df3a00772c15ef69 Mon Sep 17 00:00:00 2001 From: Joe Thornber Date: Tue, 7 Jan 2003 17:54:50 -0800 Subject: [PATCH] [PATCH] dm: Remove redundant error checking bio_alloc() shouldn't fail if GFP_NOIO is used, and the bvec count is sensible. So remove redundant error checking. --- drivers/md/dm.c | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/drivers/md/dm.c b/drivers/md/dm.c index 95bea07294c0..53bca757a523 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c @@ -347,18 +347,15 @@ static struct bio *split_bvec(struct bio *bio, sector_t sector, struct bio_vec *bv = bio->bi_io_vec + idx; clone = bio_alloc(GFP_NOIO, 1); + memcpy(clone->bi_io_vec, bv, sizeof(*bv)); - if (clone) { - memcpy(clone->bi_io_vec, bv, sizeof(*bv)); - - clone->bi_sector = sector; - clone->bi_bdev = bio->bi_bdev; - clone->bi_rw = bio->bi_rw; - clone->bi_vcnt = 1; - clone->bi_size = to_bytes(len); - clone->bi_io_vec->bv_offset = offset; - clone->bi_io_vec->bv_len = clone->bi_size; - } + clone->bi_sector = sector; + clone->bi_bdev = bio->bi_bdev; + clone->bi_rw = bio->bi_rw; + clone->bi_vcnt = 1; + clone->bi_size = to_bytes(len); + clone->bi_io_vec->bv_offset = offset; + clone->bi_io_vec->bv_len = clone->bi_size; return clone; } @@ -432,11 +429,6 @@ static void __clone_and_map(struct clone_info *ci) clone = split_bvec(bio, ci->sector, ci->idx, bv->bv_offset, max); - if (!clone) { - dec_pending(ci->io, -ENOMEM); - return; - } - __map_bio(ti, clone, ci->io); ci->sector += max; @@ -446,11 +438,6 @@ static void __clone_and_map(struct clone_info *ci) len = to_sector(bv->bv_len) - max; clone = split_bvec(bio, ci->sector, ci->idx, bv->bv_offset + to_bytes(max), len); - if (!clone) { - dec_pending(ci->io, -ENOMEM); - return; - } - __map_bio(ti, clone, ci->io); ci->sector += len; -- 2.39.5