| Message ID | 20230606073950.225178-7-hch@lst.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [01/31] block: also call ->open for incremental partition opens | expand |
On Tue, Jun 06, 2023 at 09:39:25AM +0200, Christoph Hellwig wrote: > Signed-off-by: Christoph Hellwig <hch@lst.de> > --- > drivers/cdrom/cdrom.c | 2 +- > drivers/cdrom/gdrom.c | 2 +- > drivers/scsi/sr.c | 2 +- > include/linux/cdrom.h | 2 +- > 4 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c > index adebac1bd210d9..998b03fe976e22 100644 > --- a/drivers/cdrom/cdrom.c > +++ b/drivers/cdrom/cdrom.c > @@ -1250,7 +1250,7 @@ static int check_for_audio_disc(struct cdrom_device_info *cdi, > return 0; > } > > -void cdrom_release(struct cdrom_device_info *cdi, fmode_t mode) > +void cdrom_release(struct cdrom_device_info *cdi) > { > const struct cdrom_device_ops *cdo = cdi->ops; > > diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c > index 14922403983e9e..a401dc4218a998 100644 > --- a/drivers/cdrom/gdrom.c > +++ b/drivers/cdrom/gdrom.c > @@ -481,7 +481,7 @@ static int gdrom_bdops_open(struct block_device *bdev, fmode_t mode) > bdev_check_media_change(bdev); > > mutex_lock(&gdrom_mutex); > - ret = cdrom_open(gd.cd_info, mode); > + ret = cdrom_open(gd.cd_info); > mutex_unlock(&gdrom_mutex); > return ret; > } > diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c > index 444c7efc14cba7..6d33120ee5ba85 100644 > --- a/drivers/scsi/sr.c > +++ b/drivers/scsi/sr.c > @@ -512,7 +512,7 @@ static void sr_block_release(struct gendisk *disk, fmode_t mode) > struct scsi_cd *cd = scsi_cd(disk); > > mutex_lock(&cd->lock); > - cdrom_release(&cd->cdi, mode); > + cdrom_release(&cd->cdi); > mutex_unlock(&cd->lock); > > scsi_device_put(cd->device); > diff --git a/include/linux/cdrom.h b/include/linux/cdrom.h > index 385e94732b2cf1..3f23d5239de254 100644 > --- a/include/linux/cdrom.h > +++ b/include/linux/cdrom.h > @@ -102,7 +102,7 @@ int cdrom_read_tocentry(struct cdrom_device_info *cdi, > > /* the general block_device operations structure: */ > int cdrom_open(struct cdrom_device_info *cdi, fmode_t mode); > -extern void cdrom_release(struct cdrom_device_info *cdi, fmode_t mode); > +void cdrom_release(struct cdrom_device_info *cdi); > int cdrom_ioctl(struct cdrom_device_info *cdi, struct block_device *bdev, > unsigned int cmd, unsigned long arg); > extern unsigned int cdrom_check_events(struct cdrom_device_info *cdi, > -- > 2.39.2 > Looks good, thanks. Signed-off-by: Phillip Potter <phil@philpotter.co.uk> Regards, Phil
On Tue, Jun 06, 2023 at 09:39:25AM +0200, Christoph Hellwig wrote: > Signed-off-by: Christoph Hellwig <hch@lst.de> > --- Looks good to me, Acked-by: Christian Brauner <brauner@kernel.org>
On 6/6/23 09:39, Christoph Hellwig wrote: > Signed-off-by: Christoph Hellwig <hch@lst.de> > --- > drivers/cdrom/cdrom.c | 2 +- > drivers/cdrom/gdrom.c | 2 +- > drivers/scsi/sr.c | 2 +- > include/linux/cdrom.h | 2 +- > 4 files changed, 4 insertions(+), 4 deletions(-) > Reviewed-by: Hannes Reinecke <hare@suse.de> Cheers, Hannes
On Wed, Jun 07, 2023 at 12:00:57AM +0100, Phillip Potter wrote: > Looks good, thanks. > > Signed-off-by: Phillip Potter <phil@philpotter.co.uk> Hmm, these signoffs don't really make sense here. Were they intended as Reviewed-bys?
On Thu, Jun 08, 2023 at 10:41:29AM +0200, Christoph Hellwig wrote: > On Wed, Jun 07, 2023 at 12:00:57AM +0100, Phillip Potter wrote: > > Looks good, thanks. > > > > Signed-off-by: Phillip Potter <phil@philpotter.co.uk> > > Hmm, these signoffs don't really make sense here. Were they intended > as Reviewed-bys? > Hi Christoph, Yes indeed - I was under the impression it was appropriate for a maintainer to signal their approval of a patch to maintained code using a Signed-off-by tag due to their involvement in the submission process? Apologies if I've got this wrong, happy to send Reviewed-bys by all means. Regards, Phil
On Thu, Jun 08, 2023 at 09:47:27AM +0100, Phillip Potter wrote: > Yes indeed - I was under the impression it was appropriate for a > maintainer to signal their approval of a patch to maintained code using > a Signed-off-by tag due to their involvement in the submission process? > Apologies if I've got this wrong, happy to send Reviewed-bys by all > means. Signed-off-by is for the chain that the patches pass through. You add it when you apply or forward the patch. Just give me a Reviewed-by tag and say it shold apply to patches 1 to 6 and I'll add it.
On Thu, Jun 08, 2023 at 11:04:44AM +0200, Christoph Hellwig wrote: > On Thu, Jun 08, 2023 at 09:47:27AM +0100, Phillip Potter wrote: > > Yes indeed - I was under the impression it was appropriate for a > > maintainer to signal their approval of a patch to maintained code using > > a Signed-off-by tag due to their involvement in the submission process? > > Apologies if I've got this wrong, happy to send Reviewed-bys by all > > means. > > Signed-off-by is for the chain that the patches pass through. You add > it when you apply or forward the patch. Just give me a Reviewed-by > tag and say it shold apply to patches 1 to 6 and I'll add it. Thanks for the guidance. Please apply the following to the block patch (1) and the CD-ROM patches (2-6) of your series, all looks good to me: Reviewed-by: Phillip Potter <phil@philpotter.co.uk> Regards, Phil
On Tue, Jun 06, 2023 at 09:39:25AM +0200, Christoph Hellwig wrote: > Signed-off-by: Christoph Hellwig <hch@lst.de> > --- $ git grep cdrom_release Documentation/cdrom/cdrom-standard.rst: cdrom_release, /* release */ Documentation/cdrom/cdrom-standard.rst:the door, should be left over to the general routine *cdrom_release()*. Documentation/cdrom/cdrom-standard.rst: void cdrom_release(struct inode *ip, struct file *fp) ^^^^^^^^^^^^^^^^^ drivers/cdrom/cdrom.c:void cdrom_release(struct cdrom_device_info *cdi) drivers/cdrom/cdrom.c: cd_dbg(CD_CLOSE, "entering cdrom_release\n"); drivers/cdrom/cdrom.c:EXPORT_SYMBOL(cdrom_release); drivers/cdrom/gdrom.c: cdrom_release(gd.cd_info, mode); ^^^^^^ drivers/scsi/sr.c: cdrom_release(&cd->cdi); include/linux/cdrom.h:void cdrom_release(struct cdrom_device_info *cdi); $ git grep cdrom_open Documentation/cdrom/cdrom-standard.rst: cdrom_open, /* open */ Documentation/cdrom/cdrom-standard.rst: int cdrom_open(struct inode * ip, struct file * fp) Documentation/cdrom/cdrom-standard.rst:This function implements the reverse-logic of *cdrom_open()*, and then drivers/cdrom/cdrom.c:static int cdrom_open_write(struct cdrom_device_info *cdi) drivers/cdrom/cdrom.c:int cdrom_open(struct cdrom_device_info *cdi, blk_mode_t mode) drivers/cdrom/cdrom.c: cd_dbg(CD_OPEN, "entering cdrom_open\n"); drivers/cdrom/cdrom.c: if (cdrom_open_write(cdi)) drivers/cdrom/cdrom.c:EXPORT_SYMBOL(cdrom_open); drivers/cdrom/gdrom.c: ret = cdrom_open(gd.cd_info); ^^^^^^^^^^ drivers/scsi/sr.c: ret = cdrom_open(&cd->cdi, mode); include/linux/cdrom.h:int cdrom_open(struct cdrom_device_info *cdi, blk_mode_t mode); > drivers/cdrom/cdrom.c | 2 +- > drivers/cdrom/gdrom.c | 2 +- > drivers/scsi/sr.c | 2 +- > include/linux/cdrom.h | 2 +- > 4 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c > index adebac1bd210d9..998b03fe976e22 100644 > --- a/drivers/cdrom/cdrom.c > +++ b/drivers/cdrom/cdrom.c > @@ -1250,7 +1250,7 @@ static int check_for_audio_disc(struct cdrom_device_info *cdi, > return 0; > } > > -void cdrom_release(struct cdrom_device_info *cdi, fmode_t mode) > +void cdrom_release(struct cdrom_device_info *cdi) > { > const struct cdrom_device_ops *cdo = cdi->ops; > > diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c > index 14922403983e9e..a401dc4218a998 100644 > --- a/drivers/cdrom/gdrom.c > +++ b/drivers/cdrom/gdrom.c > @@ -481,7 +481,7 @@ static int gdrom_bdops_open(struct block_device *bdev, fmode_t mode) > bdev_check_media_change(bdev); > > mutex_lock(&gdrom_mutex); > - ret = cdrom_open(gd.cd_info, mode); > + ret = cdrom_open(gd.cd_info); > mutex_unlock(&gdrom_mutex); > return ret; > } > diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c > index 444c7efc14cba7..6d33120ee5ba85 100644 > --- a/drivers/scsi/sr.c > +++ b/drivers/scsi/sr.c > @@ -512,7 +512,7 @@ static void sr_block_release(struct gendisk *disk, fmode_t mode) > struct scsi_cd *cd = scsi_cd(disk); > > mutex_lock(&cd->lock); > - cdrom_release(&cd->cdi, mode); > + cdrom_release(&cd->cdi); > mutex_unlock(&cd->lock); > > scsi_device_put(cd->device); > diff --git a/include/linux/cdrom.h b/include/linux/cdrom.h > index 385e94732b2cf1..3f23d5239de254 100644 > --- a/include/linux/cdrom.h > +++ b/include/linux/cdrom.h > @@ -102,7 +102,7 @@ int cdrom_read_tocentry(struct cdrom_device_info *cdi, > > /* the general block_device operations structure: */ > int cdrom_open(struct cdrom_device_info *cdi, fmode_t mode); > -extern void cdrom_release(struct cdrom_device_info *cdi, fmode_t mode); > +void cdrom_release(struct cdrom_device_info *cdi); > int cdrom_ioctl(struct cdrom_device_info *cdi, struct block_device *bdev, > unsigned int cmd, unsigned long arg); > extern unsigned int cdrom_check_events(struct cdrom_device_info *cdi, > -- > 2.39.2 > > > ______________________________________________________ > Linux MTD discussion mailing list > http://lists.infradead.org/mailman/listinfo/linux-mtd/
diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c index adebac1bd210d9..998b03fe976e22 100644 --- a/drivers/cdrom/cdrom.c +++ b/drivers/cdrom/cdrom.c @@ -1250,7 +1250,7 @@ static int check_for_audio_disc(struct cdrom_device_info *cdi, return 0; } -void cdrom_release(struct cdrom_device_info *cdi, fmode_t mode) +void cdrom_release(struct cdrom_device_info *cdi) { const struct cdrom_device_ops *cdo = cdi->ops; diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c index 14922403983e9e..a401dc4218a998 100644 --- a/drivers/cdrom/gdrom.c +++ b/drivers/cdrom/gdrom.c @@ -481,7 +481,7 @@ static int gdrom_bdops_open(struct block_device *bdev, fmode_t mode) bdev_check_media_change(bdev); mutex_lock(&gdrom_mutex); - ret = cdrom_open(gd.cd_info, mode); + ret = cdrom_open(gd.cd_info); mutex_unlock(&gdrom_mutex); return ret; } diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c index 444c7efc14cba7..6d33120ee5ba85 100644 --- a/drivers/scsi/sr.c +++ b/drivers/scsi/sr.c @@ -512,7 +512,7 @@ static void sr_block_release(struct gendisk *disk, fmode_t mode) struct scsi_cd *cd = scsi_cd(disk); mutex_lock(&cd->lock); - cdrom_release(&cd->cdi, mode); + cdrom_release(&cd->cdi); mutex_unlock(&cd->lock); scsi_device_put(cd->device); diff --git a/include/linux/cdrom.h b/include/linux/cdrom.h index 385e94732b2cf1..3f23d5239de254 100644 --- a/include/linux/cdrom.h +++ b/include/linux/cdrom.h @@ -102,7 +102,7 @@ int cdrom_read_tocentry(struct cdrom_device_info *cdi, /* the general block_device operations structure: */ int cdrom_open(struct cdrom_device_info *cdi, fmode_t mode); -extern void cdrom_release(struct cdrom_device_info *cdi, fmode_t mode); +void cdrom_release(struct cdrom_device_info *cdi); int cdrom_ioctl(struct cdrom_device_info *cdi, struct block_device *bdev, unsigned int cmd, unsigned long arg); extern unsigned int cdrom_check_events(struct cdrom_device_info *cdi,
Signed-off-by: Christoph Hellwig <hch@lst.de> --- drivers/cdrom/cdrom.c | 2 +- drivers/cdrom/gdrom.c | 2 +- drivers/scsi/sr.c | 2 +- include/linux/cdrom.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)