From: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
To: Ben Hutchings <ben@decadent.org.uk>
Cc: Jiri Kosina <jkosina@suse.cz>,
Andrew Morton <akpm@linux-foundation.org>,
Jens Axboe <axboe@kernel.dk>, Tejun Heo <tj@kernel.org>,
linux-kernel@vger.kernel.org, Vivek Goyal <vgoyal@redhat.com>
Subject: Re: [PATCH v3 4/6] floppy: properly handle failure on add_disk loop
Date: Mon, 27 Aug 2012 20:53:02 -0300 [thread overview]
Message-ID: <20120827235301.GB3030@herton-Z68MA-D2H-B3> (raw)
In-Reply-To: <20120814144310.GD5277@herton-Z68MA-D2H-B3>
On Tue, Aug 14, 2012 at 11:43:11AM -0300, Herton Ronaldo Krzesinski wrote:
> On Tue, Aug 14, 2012 at 04:31:23AM +0100, Ben Hutchings wrote:
> > On Mon, 2012-08-13 at 15:16 -0300, Herton Ronaldo Krzesinski wrote:
> > > On do_floppy_init, if something failed inside the loop we call add_disk,
> > > there was no cleanup of previous iterations in the error handling.
> > >
> > > Cc: stable@vger.kernel.org
> > > Acked-by: Vivek Goyal <vgoyal@redhat.com>
> > > Signed-off-by: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
> >
> > This depends on 3/6. If that's replaced by my proposed fix, then:
I redid the patch series with your proposed fix, and I'm going to submit it
again in some minutes, so I hope finally it goes forward.
> >
> > > ---
> > > drivers/block/floppy.c | 10 +++++++++-
> > > 1 file changed, 9 insertions(+), 1 deletion(-)
> > >
> > > diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
> > > index 9272203..3eafe93 100644
> > > --- a/drivers/block/floppy.c
> > > +++ b/drivers/block/floppy.c
> > > @@ -4294,7 +4294,7 @@ static int __init do_floppy_init(void)
> > >
> > > err = platform_device_register(&floppy_device[drive]);
> > > if (err)
> > > - goto out_release_dma;
> > > + goto out_remove_drives;
> > >
> > > err = device_create_file(&floppy_device[drive].dev,
> > > &dev_attr_cmos);
> > > @@ -4313,6 +4313,14 @@ static int __init do_floppy_init(void)
> > >
> > > out_unreg_platform_dev:
> > > platform_device_unregister(&floppy_device[drive]);
> > > +out_remove_drives:
> > > + while (drive--) {
> > > + if (disk_registered[drive]) {
> >
> > I think the test of allowed_drive_mask and FDC version before
> > registering each driver should be factored out into a function that you
> > can use here. There would then no need for the disk_registered array.
>
> Seems a better approach. I'll redo the patches, but I'm not sure how to
> proceed now, since it depends on your change. Patches 4-6 that I did
> needs to be dropped/redone. At first my patches 0001/0002 could be
> applied with yours, then I would submit another series for the rest. Or
> I could take your change and submit your patch along with my series.
>
> >
> > Ben.
> >
--
[]'s
Herton
next prev parent reply other threads:[~2012-08-27 23:53 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-13 18:16 Bug fixes/cleanups for floppy driver (v2) Herton Ronaldo Krzesinski
2012-08-13 18:16 ` [PATCH v3 1/6] floppy: don't call alloc_ordered_workqueue inside the alloc_disk loop Herton Ronaldo Krzesinski
2012-08-14 2:01 ` Ben Hutchings
2012-08-13 18:16 ` [PATCH v3 2/6] floppy: do put_disk on current dr if blk_init_queue fails Herton Ronaldo Krzesinski
2012-08-14 2:04 ` Ben Hutchings
2012-08-14 19:48 ` Vivek Goyal
2012-08-14 20:08 ` Herton Ronaldo Krzesinski
2012-08-13 18:16 ` [PATCH v3 3/6] floppy: avoid leaking extra reference to queue on do_floppy_init error handling Herton Ronaldo Krzesinski
2012-08-14 3:20 ` Ben Hutchings
2012-08-14 9:03 ` Stanislaw Gruszka
2012-08-14 14:26 ` Herton Ronaldo Krzesinski
2012-08-14 14:28 ` Ben Hutchings
2012-08-14 14:33 ` Herton Ronaldo Krzesinski
2012-08-14 20:00 ` Vivek Goyal
2012-08-13 18:16 ` [PATCH v3 4/6] floppy: properly handle failure on add_disk loop Herton Ronaldo Krzesinski
2012-08-14 3:31 ` Ben Hutchings
2012-08-14 14:43 ` Herton Ronaldo Krzesinski
2012-08-27 23:53 ` Herton Ronaldo Krzesinski [this message]
2012-08-13 18:16 ` [PATCH v3 5/6] floppy: use disk_registered for checking if a drive is present Herton Ronaldo Krzesinski
2012-08-14 3:36 ` Ben Hutchings
2012-08-13 18:16 ` [PATCH v3 6/6] floppy: remove dr, reuse drive on do_floppy_init Herton Ronaldo Krzesinski
2012-08-13 18:21 ` Bug fixes/cleanups for floppy driver (v2) Herton Ronaldo Krzesinski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120827235301.GB3030@herton-Z68MA-D2H-B3 \
--to=herton.krzesinski@canonical.com \
--cc=akpm@linux-foundation.org \
--cc=axboe@kernel.dk \
--cc=ben@decadent.org.uk \
--cc=jkosina@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=tj@kernel.org \
--cc=vgoyal@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).