From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757398AbcIHGvf (ORCPT ); Thu, 8 Sep 2016 02:51:35 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:50357 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757159AbcIHGvd (ORCPT ); Thu, 8 Sep 2016 02:51:33 -0400 Date: Thu, 8 Sep 2016 08:51:37 +0200 From: Greg Kroah-Hartman To: Mark Hounschell Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org, Jens Axboe , "jikos@kernel.org >> Jiri Kosina" Subject: Re: [PATCH 4.7 114/143] Revert "floppy: fix open(O_ACCMODE) for ioctl-only open" Message-ID: <20160908065137.GB6185@kroah.com> References: <20160905164430.593075551@linuxfoundation.org> <20160905164435.446877600@linuxfoundation.org> <0bb6191c-ee18-627e-f6aa-aa3306e13977@compro.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <0bb6191c-ee18-627e-f6aa-aa3306e13977@compro.net> User-Agent: Mutt/1.7.0 (2016-08-17) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Sep 07, 2016 at 12:53:51PM -0400, Mark Hounschell wrote: > On 09/05/2016 12:44 PM, Greg Kroah-Hartman wrote: > > 4.7-stable review patch. If anyone has any objections, please let me know. > > > > ------------------ > > > > From: Jens Axboe > > > > commit 468c298ad3ed3f0d94a65f8ca00f6bfc6c2b4e33 upstream. > > > > This reverts commit ff06db1efb2ad6db06eb5b99b88a0c15a9cc9b0e. > > > > Signed-off-by: Greg Kroah-Hartman > > > > --- > > drivers/block/floppy.c | 21 ++++++++++++--------- > > 1 file changed, 12 insertions(+), 9 deletions(-) > > > > --- a/drivers/block/floppy.c > > +++ b/drivers/block/floppy.c > > @@ -3663,6 +3663,11 @@ static int floppy_open(struct block_devi > > > > opened_bdev[drive] = bdev; > > > > + if (!(mode & (FMODE_READ|FMODE_WRITE))) { > > + res = -EINVAL; > > + goto out; > > + } > > + > > res = -ENXIO; > > > > if (!floppy_track_buffer) { > > @@ -3706,15 +3711,13 @@ static int floppy_open(struct block_devi > > if (UFDCS->rawcmd == 1) > > UFDCS->rawcmd = 2; > > > > - if (mode & (FMODE_READ|FMODE_WRITE)) { > > - UDRS->last_checked = 0; > > - clear_bit(FD_OPEN_SHOULD_FAIL_BIT, &UDRS->flags); > > - check_disk_change(bdev); > > - if (test_bit(FD_DISK_CHANGED_BIT, &UDRS->flags)) > > - goto out; > > - if (test_bit(FD_OPEN_SHOULD_FAIL_BIT, &UDRS->flags)) > > - goto out; > > - } > > + UDRS->last_checked = 0; > > + clear_bit(FD_OPEN_SHOULD_FAIL_BIT, &UDRS->flags); > > + check_disk_change(bdev); > > + if (test_bit(FD_DISK_CHANGED_BIT, &UDRS->flags)) > > + goto out; > > + if (test_bit(FD_OPEN_SHOULD_FAIL_BIT, &UDRS->flags)) > > + goto out; > > > > res = -EROFS; > > > > > > > > > > Can I assume the one to revert 09954bad448791ef01202351d437abdd9497a804 will > be a separate one? Hm, I didn't think I needed that here. What is the git commit id of that patch in Linus's tree? sorry about this, greg k-h