cdrom: remove the unused cdrom_close_write release code

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 <hch@lst.de>
Reviewed-by: Phillip Potter <phil@philpotter.co.uk>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Acked-by: Christian Brauner <brauner@kernel.org>
Link: https://lore.kernel.org/r/20230608110258.189493-5-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
index 245e5bb..08abf1f 100644 (file)
--- 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 4aea8c8..0a5db0b 100644 (file)
--- 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;