Untangle code in bio.c
Hi!
bio.c uses quite ugly code with goto's, completely unneccessarily. Please apply,
Pavel
fs/bio.c +2 -4
@@ -143,7 +143,7 @@ bio =mempool_alloc (bio_pool, gfp_mask);if (unlikely (!bio)) - goto out; +return NULL ;bio_init (bio);
@@ -157,13 +157,11 @@ noiovec: bio->bi_io_vec = bvl; bio->bi_destructor = bio_destructor; -out:return bio; }mempool_free (bio, bio_pool); - bio =NULL ; - goto out; +return NULL ; }/**
Signature · 2 lines
People were complaining that M$ turns users into beta-testers... ...jr ghea gurz vagb qrirybcref, naq gurl frrz gb yvxr vg gung jnl!
Quoted 5 lines · Pavel Machek
Hi!
bio.cuses quite ugly code with goto's, completely unneccessarily. Please apply,
I wouldn't describe this as an improvement, really. Multiple return statements give me hysterics.
Quoted 15 lines
fs/bio.c +1
-1@@ -143,7 +143,7 @@ bio =mempool_alloc (bio_pool, gfp_mask);if (unlikely (!bio)) - goto out; +return NULL ;bio_init (bio);@@ -157,13 +157,11 @@ noiovec: bio->bi_io_vec = bvl;
fs/bio.c line 165
Quoted 10 lines
fs/bio.c +1
-3bio->bi_destructor = bio_destructor; -out:return bio; }mempool_free (bio, bio_pool); - bio =NULL ; - goto out; +return NULL ; }
How's this look?
struct bio *bio_alloc(int gfp_mask, int nr_iovecs)
{
struct bio *bio = mempool_alloc(bio_pool, gfp_mask);
if (likely(bio)) {
struct bio_vec *bvl = NULL;
bio_init(bio);
if (likely(nr_iovecs)) {
unsigned long idx;
bvl = bvec_alloc(gfp_mask, nr_iovecs, &idx);
if (unlikely(!bvl)) {
mempool_free(bio, bio_pool);
bio = NULL;
goto out;
}
bio->bi_flags |= idx << BIO_POOL_OFFSET;
}
bio->bi_io_vec = bvl;
bio->bi_destructor = bio_destructor;
}
out:
return bio;
}Quoted 9 lines · Andrew Morton
Quoted 5 lines · Pavel Machek
Hi!
bio.cuses quite ugly code with goto's, completely unneccessarily. Please apply,I wouldn't describe this as an improvement, really. Multiple return statements give me hysterics.
Me neither...
Quoted 44 lines
Quoted 14 lines
fs/bio.c +1
-1@@ -143,7 +143,7 @@ bio =mempool_alloc (bio_pool, gfp_mask);if (unlikely (!bio)) - goto out; +return NULL ;bio_init (bio);@@ -157,13 +157,11 @@ noiovec: bio->bi_io_vec = bvl;fs/bio.c line 165
Quoted 10 lines
fs/bio.c +1
-3bio->bi_destructor = bio_destructor; -out:return bio; }mempool_free (bio, bio_pool); - bio =NULL ; - goto out; +return NULL ; }How's this look?
struct bio *bio_alloc(int
gfp_mask, intnr_iovecs){ struct bio *bio = mempool_alloc(bio_pool, gfp_mask); if (likely(bio)) { struct bio_vec *bvl = NULL; bio_init(bio); if (likely(nr_iovecs)) { unsigned long idx; bvl = bvec_alloc(gfp_mask, nr_iovecs, &idx); if (unlikely(!bvl)) { mempool_free(bio, bio_pool); bio = NULL; goto out; }
Quoted 8 lines
bio->bi_flags |= idx << BIO_POOL_OFFSET; } bio->bi_io_vec = bvl; bio->bi_destructor = bio_destructor; } out: return bio; }
Same semantics and it looks good to me.
Signature · 1 line
Jens Axboe