2020-06-19 13:13:45

by Bean Huo

Subject: [RFC PATCH ] scsi: remove scsi_sdb_cache

From: Bean Huo <[email protected]>

After 'commit f664a3cc17b7 ("scsi: kill off the legacy IO path")',
scsi_sdb_cache not be used any more, remove it.

Signed-off-by: Bean Huo <[email protected]>
---
drivers/scsi/scsi.c | 3 ---
drivers/scsi/scsi_lib.c | 18 +-----------------
drivers/scsi/scsi_priv.h | 1 -
3 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index 56c24a73e0c7..24619c3bebd5 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -754,9 +754,6 @@ static int __init init_scsi(void)
{
int error;

- error = scsi_init_queue();
- if (error)
- return error;
error = scsi_init_procfs();
if (error)
goto cleanup_queue;
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 0ba7a65e7c8d..3fadfe9447e8 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -52,7 +52,6 @@
#define SCSI_INLINE_SG_CNT 2
#endif

-static struct kmem_cache *scsi_sdb_cache;
static struct kmem_cache *scsi_sense_cache;
static struct kmem_cache *scsi_sense_isadma_cache;
static DEFINE_MUTEX(scsi_sense_cache_mutex);
@@ -1955,24 +1954,10 @@ void scsi_unblock_requests(struct Scsi_Host *shost)
}
EXPORT_SYMBOL(scsi_unblock_requests);

-int __init scsi_init_queue(void)
-{
- scsi_sdb_cache = kmem_cache_create("scsi_data_buffer",
- sizeof(struct scsi_data_buffer),
- 0, 0, NULL);
- if (!scsi_sdb_cache) {
- printk(KERN_ERR "SCSI: can't init scsi sdb cache\n");
- return -ENOMEM;
- }
-
- return 0;
-}
-
void scsi_exit_queue(void)
{
kmem_cache_destroy(scsi_sense_cache);
kmem_cache_destroy(scsi_sense_isadma_cache);
- kmem_cache_destroy(scsi_sdb_cache);
}

/**
@@ -2039,7 +2024,6 @@ scsi_mode_select(struct scsi_device *sdev, int pf, int sp, int modepage,
real_buffer[1] = data->medium_type;
real_buffer[2] = data->device_specific;
real_buffer[3] = data->block_descriptor_length;
-

cmd[0] = MODE_SELECT;
cmd[4] = len;
@@ -2227,7 +2211,7 @@ scsi_device_set_state(struct scsi_device *sdev, enum scsi_device_state state)
goto illegal;
}
break;
-
+
case SDEV_RUNNING:
switch (oldstate) {
case SDEV_CREATED:
diff --git a/drivers/scsi/scsi_priv.h b/drivers/scsi/scsi_priv.h
index 22b6585e28b4..d12ada035961 100644
--- a/drivers/scsi/scsi_priv.h
+++ b/drivers/scsi/scsi_priv.h
@@ -93,7 +93,6 @@ extern struct request_queue *scsi_mq_alloc_queue(struct scsi_device *sdev);
extern void scsi_start_queue(struct scsi_device *sdev);
extern int scsi_mq_setup_tags(struct Scsi_Host *shost);
extern void scsi_mq_destroy_tags(struct Scsi_Host *shost);
-extern int scsi_init_queue(void);
extern void scsi_exit_queue(void);
extern void scsi_evt_thread(struct work_struct *work);
struct request_queue;
--
2.17.1

2020-06-19 14:36:18

by Bart Van Assche

Subject: Re: [RFC PATCH ] scsi: remove scsi_sdb_cache

On 2020-06-19 06:10, Bean Huo wrote:
> @@ -2039,7 +2024,6 @@ scsi_mode_select(struct scsi_device *sdev, int pf, int sp, int modepage,
> real_buffer[1] = data->medium_type;
> real_buffer[2] = data->device_specific;
> real_buffer[3] = data->block_descriptor_length;
> -
>
> cmd[0] = MODE_SELECT;
> cmd[4] = len;
> @@ -2227,7 +2211,7 @@ scsi_device_set_state(struct scsi_device *sdev, enum scsi_device_state state)
> goto illegal;
> }
> break;
> -
> +
> case SDEV_RUNNING:
> switch (oldstate) {
> case SDEV_CREATED:

If these whitespace changes are left out, feel free to add:

Reviewed-by: Bart Van Assche <[email protected]>

2020-06-19 16:17:45

by Bean Huo

Subject: Re: [RFC PATCH ] scsi: remove scsi_sdb_cache

Hi Bart

Thanks.

On Fri, 2020-06-19 at 07:31 -0700, Bart Van Assche wrote:
> On 2020-06-19 06:10, Bean Huo wrote:
> > @@ -2039,7 +2024,6 @@ scsi_mode_select(struct scsi_device *sdev,
> > int pf, int sp, int modepage,
> > real_buffer[1] = data->medium_type;
> > real_buffer[2] = data->device_specific;
> > real_buffer[3] = data->block_descriptor_length;
> > -
Here delete a blank line since there are multiple blank lines.
> >
> >
> > cmd[0] = MODE_SELECT;
> > cmd[4] = len;
> > @@ -2227,7 +2211,7 @@ scsi_device_set_state(struct scsi_device
> > *sdev, enum scsi_device_state state)
> > goto illegal;
> > }
> > break;
> > -
> > +

Here has trailing whitespace, delete it.

> > case SDEV_RUNNING:
> > switch (oldstate) {
> > case SDEV_CREATED:
>
> If these whitespace changes are left out, feel free to add:
>
> Reviewed-by: Bart Van Assche <[email protected]>

Bean