From: Christoph Hellwig <hch@lst.de>
To: Jens Axboe <axboe@kernel.dk>
Cc: Richard Weinberger <richard@nod.at>,
Josef Bacik <josef@toxicpanda.com>,
"Md. Haris Iqbal" <haris.iqbal@ionos.com>,
Jack Wang <jinpu.wang@ionos.com>,
Phillip Potter <phil@philpotter.co.uk>, Coly Li <colyli@suse.de>,
Miquel Raynal <miquel.raynal@bootlin.com>,
Vignesh Raghavendra <vigneshr@ti.com>,
"Martin K. Petersen" <martin.petersen@oracle.com>,
Chris Mason <clm@fb.com>, David Sterba <dsterba@suse.com>,
Alexander Viro <viro@zeniv.linux.org.uk>,
Christian Brauner <brauner@kernel.org>,
"Rafael J. Wysocki" <rafael@kernel.org>,
Pavel Machek <pavel@ucw.cz>,
dm-devel@redhat.com, linux-block@vger.kernel.org,
linux-um@lists.infradead.org, linux-scsi@vger.kernel.org,
linux-bcache@vger.kernel.org, linux-mtd@lists.infradead.org,
linux-nvme@lists.infradead.org, linux-btrfs@vger.kernel.org,
linux-f2fs-devel@lists.sourceforge.net,
linux-nilfs@vger.kernel.org, linux-fsdevel@vger.kernel.org,
linux-pm@vger.kernel.org
Subject: [PATCH 04/31] cdrom: remove the unused cdrom_close_write release code
Date: Tue, 6 Jun 2023 09:39:23 +0200 [thread overview]
Message-ID: <20230606073950.225178-5-hch@lst.de> (raw)
In-Reply-To: <20230606073950.225178-1-hch@lst.de>
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>
---
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
next prev parent reply other threads:[~2023-06-06 7:41 UTC|newest]
Thread overview: 125+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-06 7:39 decouple block open flags from fmode_t Christoph Hellwig
2023-06-06 7:39 ` [PATCH 01/31] block: also call ->open for incremental partition opens Christoph Hellwig
2023-06-07 8:14 ` Christian Brauner
2023-06-07 8:32 ` Christoph Hellwig
2023-06-07 12:10 ` Hannes Reinecke
2023-06-06 7:39 ` [PATCH 02/31] cdrom: remove the unused bdev argument to cdrom_open Christoph Hellwig
2023-06-06 22:50 ` Phillip Potter
2023-06-07 8:16 ` Christian Brauner
2023-06-07 12:10 ` Hannes Reinecke
2023-06-06 7:39 ` [PATCH 03/31] cdrom: remove the unused mode argument to cdrom_ioctl Christoph Hellwig
2023-06-06 22:54 ` Phillip Potter
2023-06-07 8:17 ` Christian Brauner
2023-06-07 12:11 ` Hannes Reinecke
2023-06-06 7:39 ` Christoph Hellwig [this message]
2023-06-06 22:56 ` [PATCH 04/31] cdrom: remove the unused cdrom_close_write release code Phillip Potter
2023-06-07 8:17 ` Christian Brauner
2023-06-07 12:12 ` Hannes Reinecke
2023-06-06 7:39 ` [PATCH 05/31] cdrom: track if a cdrom_device_info was opened for data Christoph Hellwig
2023-06-06 22:59 ` Phillip Potter
2023-06-07 8:19 ` Christian Brauner
2023-06-07 12:13 ` Hannes Reinecke
2023-06-07 12:20 ` Christoph Hellwig
2023-06-06 7:39 ` [PATCH 06/31] cdrom: remove the unused mode argument to cdrom_release Christoph Hellwig
2023-06-06 23:00 ` Phillip Potter
2023-06-08 8:41 ` Christoph Hellwig
2023-06-08 8:47 ` Phillip Potter
2023-06-08 9:04 ` Christoph Hellwig
2023-06-08 9:44 ` Phillip Potter
2023-06-07 8:20 ` Christian Brauner
2023-06-07 12:14 ` Hannes Reinecke
2023-06-27 5:41 ` Guenter Roeck
2023-06-06 7:39 ` [PATCH 07/31] block: pass a gendisk on bdev_check_media_change Christoph Hellwig
2023-06-07 8:25 ` Christian Brauner
2023-06-07 12:15 ` Hannes Reinecke
2023-06-06 7:39 ` [PATCH 08/31] block: share code between disk_check_media_change and disk_force_media_change Christoph Hellwig
2023-06-07 8:26 ` Christian Brauner
2023-06-07 12:19 ` Hannes Reinecke
2023-06-07 12:21 ` Christoph Hellwig
2023-06-07 13:18 ` Hannes Reinecke
2023-06-06 7:39 ` [PATCH 09/31] block: pass a gendisk to ->open Christoph Hellwig
2023-06-07 8:34 ` Christian Brauner
2023-06-07 9:42 ` Jinpu Wang
2023-06-07 12:19 ` Hannes Reinecke
2023-06-06 7:39 ` [PATCH 10/31] block: remove the unused mode argument to ->release Christoph Hellwig
2023-06-07 8:34 ` Christian Brauner
2023-06-07 9:41 ` Jinpu Wang
2023-06-07 12:20 ` Hannes Reinecke
2023-06-06 7:39 ` [PATCH 11/31] block: rename blkdev_close to blkdev_release Christoph Hellwig
2023-06-07 8:35 ` Christian Brauner
2023-06-07 12:21 ` Hannes Reinecke
2023-06-06 7:39 ` [PATCH 12/31] swsusp: don't pass a stack address to blkdev_get_by_path Christoph Hellwig
2023-06-07 12:22 ` Hannes Reinecke
2023-06-06 7:39 ` [PATCH 13/31] bcache: " Christoph Hellwig
2023-06-07 12:23 ` Hannes Reinecke
2023-06-06 7:39 ` [PATCH 14/31] rnbd-srv: don't pass a holder for non-exclusive blkdev_get_by_path Christoph Hellwig
2023-06-07 8:39 ` Christian Brauner
2023-06-07 9:38 ` Jinpu Wang
2023-06-07 12:24 ` Hannes Reinecke
2023-06-06 7:39 ` [PATCH 15/31] btrfs: " Christoph Hellwig
2023-06-07 8:40 ` Christian Brauner
2023-06-07 12:24 ` Hannes Reinecke
2023-06-07 13:32 ` David Sterba
2023-06-06 7:39 ` [PATCH 16/31] block: use the holder as indication for exclusive opens Christoph Hellwig
2023-06-07 8:49 ` Christian Brauner
2023-06-07 9:40 ` Jinpu Wang
2023-06-07 12:29 ` Hannes Reinecke
2023-06-07 13:53 ` David Sterba
2023-06-06 7:39 ` [PATCH 17/31] block: add a sb_open_mode helper Christoph Hellwig
2023-06-07 8:55 ` Christian Brauner
2023-06-07 12:30 ` Hannes Reinecke
2023-06-06 7:39 ` [PATCH 18/31] fs: remove sb->s_mode Christoph Hellwig
2023-06-07 8:56 ` Christian Brauner
2023-06-07 13:01 ` Hannes Reinecke
2023-06-06 7:39 ` [PATCH 19/31] scsi: replace the fmode_t argument to scsi_cmd_allowed with a simple bool Christoph Hellwig
2023-06-07 8:57 ` Christian Brauner
2023-06-07 13:02 ` Hannes Reinecke
2023-06-08 1:18 ` Martin K. Petersen
2023-06-06 7:39 ` [PATCH 20/31] scsi: replace the fmode_t argument to scsi_ioctl " Christoph Hellwig
2023-06-07 8:58 ` Christian Brauner
2023-06-07 13:04 ` Hannes Reinecke
2023-06-08 1:17 ` Martin K. Petersen
2023-06-06 7:39 ` [PATCH 21/31] scsi: replace the fmode_t argument to ->sg_io_fn " Christoph Hellwig
2023-06-07 8:58 ` Christian Brauner
2023-06-07 13:05 ` Hannes Reinecke
2023-06-08 1:18 ` Martin K. Petersen
2023-06-06 7:39 ` [PATCH 22/31] nvme: replace the fmode_t argument to the nvme ioctl handlers " Christoph Hellwig
2023-06-07 8:59 ` Christian Brauner
2023-06-07 13:06 ` Hannes Reinecke
2023-06-06 7:39 ` [PATCH 23/31] mtd: block: use a simple bool to track open for write Christoph Hellwig
2023-06-06 8:24 ` Richard Weinberger
2023-06-07 9:00 ` Christian Brauner
2023-06-07 13:07 ` Hannes Reinecke
2023-06-06 7:39 ` [PATCH 24/31] rnbd-srv: replace sess->open_flags with a "bool readonly" Christoph Hellwig
2023-06-07 9:01 ` Christian Brauner
2023-06-07 9:43 ` Jinpu Wang
2023-06-07 13:07 ` Hannes Reinecke
2023-06-06 7:39 ` [PATCH 25/31] ubd: remove commented out code in ubd_open Christoph Hellwig
2023-06-06 8:20 ` Richard Weinberger
2023-06-07 9:02 ` Christian Brauner
2023-06-07 13:08 ` Hannes Reinecke
2023-06-06 7:39 ` [PATCH 26/31] block: move a few internal definitions out of blkdev.h Christoph Hellwig
2023-06-07 9:03 ` Christian Brauner
2023-06-07 13:09 ` Hannes Reinecke
2023-06-06 7:39 ` [PATCH 27/31] block: remove unused fmode_t arguments from ioctl handlers Christoph Hellwig
2023-06-07 9:03 ` Christian Brauner
2023-06-07 13:10 ` Hannes Reinecke
2023-06-06 7:39 ` [PATCH 28/31] block: replace fmode_t with a block-specific type for block open flags Christoph Hellwig
2023-06-07 9:21 ` Christian Brauner
2023-06-07 9:32 ` Christian Brauner
2023-06-07 12:16 ` Christoph Hellwig
2023-06-07 12:47 ` Christian Brauner
2023-06-07 9:45 ` Jinpu Wang
2023-06-06 7:39 ` [PATCH 29/31] block: always use I_BDEV on file->f_mapping->host to find the bdev Christoph Hellwig
2023-06-07 9:23 ` Christian Brauner
2023-06-07 13:11 ` Hannes Reinecke
2023-06-06 7:39 ` [PATCH 30/31] block: store the holder in file->private_data Christoph Hellwig
2023-06-07 9:24 ` Christian Brauner
2023-06-07 12:18 ` Christoph Hellwig
2023-06-07 13:14 ` Hannes Reinecke
2023-06-06 7:39 ` [PATCH 31/31] fs: remove the now unused FMODE_* flags Christoph Hellwig
2023-06-07 9:25 ` Christian Brauner
2023-06-07 13:15 ` Hannes Reinecke
2023-06-06 8:27 ` decouple block open flags from fmode_t Christian Brauner
2023-06-06 8:40 ` Christoph Hellwig
2023-06-07 9:27 ` Christian Brauner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230606073950.225178-5-hch@lst.de \
--to=hch@lst.de \
--cc=axboe@kernel.dk \
--cc=brauner@kernel.org \
--cc=clm@fb.com \
--cc=colyli@suse.de \
--cc=dm-devel@redhat.com \
--cc=dsterba@suse.com \
--cc=haris.iqbal@ionos.com \
--cc=jinpu.wang@ionos.com \
--cc=josef@toxicpanda.com \
--cc=linux-bcache@vger.kernel.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-f2fs-devel@lists.sourceforge.net \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=linux-nilfs@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=linux-um@lists.infradead.org \
--cc=martin.petersen@oracle.com \
--cc=miquel.raynal@bootlin.com \
--cc=pavel@ucw.cz \
--cc=phil@philpotter.co.uk \
--cc=rafael@kernel.org \
--cc=richard@nod.at \
--cc=vigneshr@ti.com \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).