Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

dm: tidy bio_io_error usage

Browse source 
Use bio_io_error() in only two places and tidy the code,
preparing for later patches.

There is no functional change in this patch.

Signed-off-by: Milan Broz <mbroz@redhat.com>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>
This commit is contained in:
Milan Broz 2007-10-19 22:38:53 +01:00 committed by Alasdair G Kergon
parent def5b5b26e
commit 9e4e5f87eb
1 changed files with 18 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
drivers/md/dm.c
View file

@ -751,15 +751,13 @@ static void __clone_and_map(struct clone_info *ci)
/* /*
* Split the bio into several clones. * Split the bio into several clones.
*/ */
static void __split_bio(struct mapped_device *md, struct bio *bio) static int __split_bio(struct mapped_device *md, struct bio *bio)
{ {
struct clone_info ci; struct clone_info ci;
ci.map = dm_get_table(md); ci.map = dm_get_table(md);
if (!ci.map) { if (unlikely(!ci.map))
bio_io_error(bio); return -EIO;
return;
}
ci.md = md; ci.md = md;
ci.bio = bio; ci.bio = bio;
@ -779,6 +777,8 @@ static void __split_bio(struct mapped_device *md, struct bio *bio)
/* drop the extra reference count */ /* drop the extra reference count */
dec_pending(ci.io, 0); dec_pending(ci.io, 0);
dm_table_put(ci.map); dm_table_put(ci.map);
return 0;
} }
/*----------------------------------------------------------------- /*-----------------------------------------------------------------
* CRUD END * CRUD END
@ -790,7 +790,7 @@ static void __split_bio(struct mapped_device *md, struct bio *bio)
*/ */
static int dm_request(struct request_queue *q, struct bio *bio) static int dm_request(struct request_queue *q, struct bio *bio)
{ {
int r; int r = -EIO;
int rw = bio_data_dir(bio); int rw = bio_data_dir(bio);
struct mapped_device *md = q->queuedata; struct mapped_device *md = q->queuedata;
@ -815,18 +815,11 @@ static int dm_request(struct request_queue *q, struct bio *bio)
while (test_bit(DMF_BLOCK_IO, &md->flags)) { while (test_bit(DMF_BLOCK_IO, &md->flags)) {
up_read(&md->io_lock); up_read(&md->io_lock);
if (bio_rw(bio) == READA) { if (bio_rw(bio) != READA)
bio_io_error(bio); r = queue_io(md, bio);
return 0;
}
r = queue_io(md, bio); if (r <= 0)
if (r < 0) { goto out_req;
bio_io_error(bio);
return 0;
} else if (r == 0)
return 0; /* deferred successfully */
/* /*
* We're in a while loop, because someone could suspend * We're in a while loop, because someone could suspend
@ -835,8 +828,13 @@ static int dm_request(struct request_queue *q, struct bio *bio)
down_read(&md->io_lock); down_read(&md->io_lock);
} }
__split_bio(md, bio); r = __split_bio(md, bio);
up_read(&md->io_lock); up_read(&md->io_lock);
out_req:
if (r < 0)
bio_io_error(bio);
return 0; return 0;
} }
@ -1235,7 +1233,8 @@ static void __flush_deferred_io(struct mapped_device *md, struct bio *c)
while (c) { while (c) {
n = c->bi_next; n = c->bi_next;
c->bi_next = NULL; c->bi_next = NULL;
__split_bio(md, c); if (__split_bio(md, c))
bio_io_error(c);
c = n; c = n;
} }
} }