On Tue, Aug 14, 2012 at 03:48:35PM -0400, Vivek Goyal wrote:
> On Mon, Aug 13, 2012 at 03:16:23PM -0300, Herton Ronaldo Krzesinski wrote:
> > If blk_init_queue fails, we do not call put_disk on the current dr
> > (dr is decremented first in the error handling loop).
> >
> > Cc: sta...@vger.kernel.org
> > Signed-off-by: Herton Ronaldo Krzesinski <herton.krzesin...@canonical.com>
> > ---
> > drivers/block/floppy.c | 1 +
> > 1 file changed, 1 insertion(+)
> >
> > diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
> > index c8d9e68..1e09e99 100644
> > --- a/drivers/block/floppy.c
> > +++ b/drivers/block/floppy.c
> > @@ -4151,6 +4151,7 @@ static int __init do_floppy_init(void)
> >
> > disks[dr]->queue = blk_init_queue(do_fd_request, &floppy_lock);
> > if (!disks[dr]->queue) {
> > + put_disk(disks[dr]);
> > err = -ENOMEM;
> > goto out_put_disk;
> > }
>
> I think it will create conflict with patch 6. Will it not call put_disk()
> twice on disks[dr].
It'll not conflict, because I took care of removing it on patch 6.
> Why are we retaining this patch given the fact that we will loop through
> all the drives and queues in out_put_disk.
Because I wanted a minimal bug fix for stable, didn't want to bring
entire code shuffling/cleanup in patch 6 for stable, and thus didn't
mark that patch for stable.
>
> Thanks
> Vivek
>
--
[]'s
Herton
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
