From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757411Ab2HNUJM (ORCPT ); Tue, 14 Aug 2012 16:09:12 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:59590 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757397Ab2HNUJH (ORCPT ); Tue, 14 Aug 2012 16:09:07 -0400 Date: Tue, 14 Aug 2012 17:08:56 -0300 From: Herton Ronaldo Krzesinski To: Vivek Goyal Cc: Jiri Kosina , Andrew Morton , Jens Axboe , Tejun Heo , linux-kernel@vger.kernel.org, Ben Hutchings Subject: Re: [PATCH v3 2/6] floppy: do put_disk on current dr if blk_init_queue fails Message-ID: <20120814200855.GF5277@herton-Z68MA-D2H-B3> References: <1344881787-6422-1-git-send-email-herton.krzesinski@canonical.com> <1344881787-6422-3-git-send-email-herton.krzesinski@canonical.com> <20120814194835.GE5760@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20120814194835.GE5760@redhat.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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: stable@vger.kernel.org > > Signed-off-by: Herton Ronaldo Krzesinski > > --- > > 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