On Fri, 2007-08-17 at 12:10 -0400, Josef Sipek wrote: > On Thu, Aug 16, 2007 at 09:45:36AM +0200, Peter Zijlstra wrote: > > provide BDI constructor/destructor hooks > .... > > Index: linux-2.6/drivers/block/rd.c > > =================================================================== > > --- linux-2.6.orig/drivers/block/rd.c > > +++ linux-2.6/drivers/block/rd.c > .... > > @@ -419,7 +422,19 @@ static void __exit rd_cleanup(void) > > static int __init rd_init(void) > > { > > int i; > > - int err = -ENOMEM; > > + int err; > > + > > + err = bdi_init(&rd_backing_dev_info); > > + if (err) > > + goto out2; > > + > > + err = bdi_init(&rd_file_backing_dev_info); > > + if (err) { > > + bdi_destroy(&rd_backing_dev_info); > > + goto out2; > > How about this... seems like a sane idea. > if (err) > goto out3; > > > + } > > + > > + err = -ENOMEM; > > > > if (rd_blocksize > PAGE_SIZE || rd_blocksize < 512 || > > (rd_blocksize & (rd_blocksize-1))) { > > @@ -473,6 +488,9 @@ out: > > put_disk(rd_disks[i]); > > blk_cleanup_queue(rd_queue[i]); > > } > > + bdi_destroy(&rd_backing_dev_info); > > + bdi_destroy(&rd_file_backing_dev_info); > > bdi_destroy(&rd_file_backing_dev_info); > out3: > bdi_destroy(&rd_backing_dev_info); > > Sure you might want to switch from numbered labels to something a bit more > descriptive. I was just keeping in style here. Thanks for looking this over, all these error paths did make my head spin a little.
Attachment:
signature.asc
Description: This is a digitally signed message part
- References:
- [PATCH 00/23] per device dirty throttling -v9
- From: Peter Zijlstra <[email protected]>
- [PATCH 11/23] mm: bdi init hooks
- From: Peter Zijlstra <[email protected]>
- Re: [PATCH 11/23] mm: bdi init hooks
- From: Josef Sipek <[email protected]>
- [PATCH 00/23] per device dirty throttling -v9
- Prev by Date: Re: [PATCH] rtc: Make rtc-ds1742 driver hotplug-aware
- Next by Date: Re: [PATCH 16/23] mm: scalable bdi statistics counters.
- Previous by thread: Re: [PATCH 11/23] mm: bdi init hooks
- Next by thread: [PATCH 13/23] mtd: bdi init hooks
- Index(es):