Move bio_io_error directly to __process_bio, from its caller. This saves some code duplication in further patches. Signed-off-by: Mikulas Patocka --- drivers/md/dm.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) Index: linux-2.6.29-rc1-devel/drivers/md/dm.c =================================================================== --- linux-2.6.29-rc1-devel.orig/drivers/md/dm.c 2009-01-19 02:18:40.000000000 +0100 +++ linux-2.6.29-rc1-devel/drivers/md/dm.c 2009-01-19 02:19:20.000000000 +0100 @@ -821,14 +821,16 @@ static int __clone_and_map(struct clone_ /* * Split the bio into several clones and submit it to targets. */ -static int __process_bio(struct mapped_device *md, struct bio *bio) +static void __process_bio(struct mapped_device *md, struct bio *bio) { struct clone_info ci; int error = 0; ci.map = dm_get_table(md); - if (unlikely(!ci.map)) - return -EIO; + if (unlikely(!ci.map)) { + bio_io_error(bio); + return; + } ci.md = md; ci.bio = bio; @@ -848,8 +850,6 @@ static int __process_bio(struct mapped_d /* drop the extra reference count */ dec_pending(ci.io, error); dm_table_put(ci.map); - - return 0; } /*----------------------------------------------------------------- * CRUD END @@ -949,8 +949,9 @@ static int dm_request(struct request_que down_read(&md->io_lock); } - r = __process_bio(md, bio); + __process_bio(md, bio); up_read(&md->io_lock); + return 0; out_req: if (r < 0) @@ -1411,8 +1412,7 @@ next_bio: spin_unlock_irq(&md->deferred_lock); if (c) { - if (__process_bio(md, c)) - bio_io_error(c); + __process_bio(md, c); goto next_bio; }