From mboxrd@z Thu Jan 1 00:00:00 1970 From: Phillip Potter Subject: Re: [PATCH 04/31] cdrom: remove the unused cdrom_close_write release code Date: Tue, 6 Jun 2023 23:56:35 +0100 Message-ID: References: <20230606073950.225178-1-hch@lst.de> <20230606073950.225178-5-hch@lst.de> Mime-Version: 1.0 Return-path: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=philpotter-co-uk.20221208.gappssmtp.com; s=20221208; t=1686092198; x=1688684198; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=dxnH2bKFZYPbzBbkbYN/M0Q5lBbTzYSqgYP+SCcXSJI=; b=3Xvtk1P3rsuJwoQYdcNaIrVJbuVBsdvl8atd55hWaIz1KQGhnj3eu105ZBz04fe5o0 bJBqSEdvv1cc1VTWGGz/fO6McIZaD29H2QTcZZowwJNcGQZ7t/UnfWNV4E7DFYs4JTZC JK8jOTDJZZkq3qXW+Rs6tHs8IFdoI//zMHB4kkQDJHBNiZ2aebLc012u3kSvYvcS3kJj 2em5+3gUb2wOluV1JIZAmCMI9jEnW/0Z6RoKMgYKJVg730jOYRHsWmCAjO2NMqKy2EKb Pqk0NlLR8E1RenDJro9UPHBYgGqvnqPI3VYXLnLHUgMcg7uSMr3Px2KzI0+WFOK3XnFx r+gg== Content-Disposition: inline In-Reply-To: <20230606073950.225178-5-hch-jcswGhMUV9g@public.gmane.org> List-ID: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Christoph Hellwig Cc: Jens Axboe , Richard Weinberger , Josef Bacik , "Md. Haris Iqbal" , Jack Wang , Phillip Potter , Coly Li , Miquel Raynal , Vignesh Raghavendra , "Martin K. Petersen" , Chris Mason , David Sterba , Alexander Viro , Christian Brauner , "Rafael J. Wysocki" , Pavel Machek , dm-devel-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org, linux-block-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-um-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, linux-scsi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-bcache-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-mtd-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, linux-nvm On Tue, Jun 06, 2023 at 09:39:23AM +0200, Christoph Hellwig wrote: > cdrom_close_write is empty, and the for_data flag it is keyed off is > never set. Remove all this clutter. > > Signed-off-by: Christoph Hellwig > --- > drivers/cdrom/cdrom.c | 15 --------------- > include/linux/cdrom.h | 1 - > 2 files changed, 16 deletions(-) > > diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c > index 245e5bbb05d41c..08abf1ffede002 100644 > --- a/drivers/cdrom/cdrom.c > +++ b/drivers/cdrom/cdrom.c > @@ -978,15 +978,6 @@ static void cdrom_dvd_rw_close_write(struct cdrom_device_info *cdi) > cdi->media_written = 0; > } > > -static int cdrom_close_write(struct cdrom_device_info *cdi) > -{ > -#if 0 > - return cdrom_flush_cache(cdi); > -#else > - return 0; > -#endif > -} > - > /* badly broken, I know. Is due for a fixup anytime. */ > static void cdrom_count_tracks(struct cdrom_device_info *cdi, tracktype *tracks) > { > @@ -1282,12 +1273,6 @@ void cdrom_release(struct cdrom_device_info *cdi, fmode_t mode) > opened_for_data = !(cdi->options & CDO_USE_FFLAGS) || > !(mode & FMODE_NDELAY); > > - /* > - * flush cache on last write release > - */ > - if (CDROM_CAN(CDC_RAM) && !cdi->use_count && cdi->for_data) > - cdrom_close_write(cdi); > - > cdo->release(cdi); > if (cdi->use_count == 0) { /* last process that closes dev*/ > if (opened_for_data && > diff --git a/include/linux/cdrom.h b/include/linux/cdrom.h > index 4aea8c82d16971..0a5db0b0c958a1 100644 > --- a/include/linux/cdrom.h > +++ b/include/linux/cdrom.h > @@ -61,7 +61,6 @@ struct cdrom_device_info { > __u8 last_sense; > __u8 media_written; /* dirty flag, DVD+RW bookkeeping */ > unsigned short mmc3_profile; /* current MMC3 profile */ > - int for_data; > int (*exit)(struct cdrom_device_info *); > int mrw_mode_page; > __s64 last_media_change_ms; > -- > 2.39.2 > All good, many thanks. Signed-off-by: Phillip Potter Regards, Phil