| Message ID | 20230628150638.53218-1-mlombard@redhat.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | scsi: scsi_debug: remove dead code | expand |
On Wed, 2023-06-28 at 17:06 +0200, Maurizio Lombardi wrote: > The ramdisk rwlocks are not used anymore > > Fixes: 87c715dcde63 ("scsi: scsi_debug: Add per_host_store option") > Signed-off-by: Maurizio Lombardi <mlombard@redhat.com> > --- > drivers/scsi/scsi_debug.c | 8 -------- > 1 file changed, 8 deletions(-) > > diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c > index 8c58128ad32a..9c0af50501f9 100644 > --- a/drivers/scsi/scsi_debug.c > +++ b/drivers/scsi/scsi_debug.c > @@ -841,11 +841,6 @@ static int sdeb_zbc_nr_conv = > DEF_ZBC_NR_CONV_ZONES; > static int submit_queues = DEF_SUBMIT_QUEUES; /* > 1 for multi- > queue (mq) */ > static int poll_queues; /* iouring iopoll interface.*/ > > -static DEFINE_RWLOCK(atomic_rw); > -static DEFINE_RWLOCK(atomic_rw2); > - > -static rwlock_t *ramdisk_lck_a[2]; > - > static char sdebug_proc_name[] = MY_NAME; > static const char *my_name = MY_NAME; > > @@ -6818,9 +6813,6 @@ static int __init scsi_debug_init(void) > int k, ret, hosts_to_add; > int idx = -1; > > - ramdisk_lck_a[0] = &atomic_rw; > - ramdisk_lck_a[1] = &atomic_rw2; > - > if (sdebug_ndelay >= 1000 * 1000 * 1000) { > pr_warn("ndelay must be less than 1 second, > ignored\n"); > sdebug_ndelay = 0; Looks good to me: linux]$ grep -e atomic_rw -e atomic_rw2 -e ramdisk_lck_a drivers/scsi/scsi_debug.c static DEFINE_RWLOCK(atomic_rw); static DEFINE_RWLOCK(atomic_rw2); static rwlock_t *ramdisk_lck_a[2]; ramdisk_lck_a[0] = &atomic_rw; ramdisk_lck_a[1] = &atomic_rw2; Reviewed-by: Laurence Oberman <loberman@redhat.com>
Maurizio,
> The ramdisk rwlocks are not used anymore
Applied to 6.5/scsi-staging, thanks!
On Wed, 28 Jun 2023 17:06:38 +0200, Maurizio Lombardi wrote: > The ramdisk rwlocks are not used anymore > > Applied to 6.5/scsi-fixes, thanks! [1/1] scsi: scsi_debug: remove dead code https://git.kernel.org/mkp/scsi/c/23815df5af57
diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c index 8c58128ad32a..9c0af50501f9 100644 --- a/drivers/scsi/scsi_debug.c +++ b/drivers/scsi/scsi_debug.c @@ -841,11 +841,6 @@ static int sdeb_zbc_nr_conv = DEF_ZBC_NR_CONV_ZONES; static int submit_queues = DEF_SUBMIT_QUEUES; /* > 1 for multi-queue (mq) */ static int poll_queues; /* iouring iopoll interface.*/ -static DEFINE_RWLOCK(atomic_rw); -static DEFINE_RWLOCK(atomic_rw2); - -static rwlock_t *ramdisk_lck_a[2]; - static char sdebug_proc_name[] = MY_NAME; static const char *my_name = MY_NAME; @@ -6818,9 +6813,6 @@ static int __init scsi_debug_init(void) int k, ret, hosts_to_add; int idx = -1; - ramdisk_lck_a[0] = &atomic_rw; - ramdisk_lck_a[1] = &atomic_rw2; - if (sdebug_ndelay >= 1000 * 1000 * 1000) { pr_warn("ndelay must be less than 1 second, ignored\n"); sdebug_ndelay = 0;
The ramdisk rwlocks are not used anymore Fixes: 87c715dcde63 ("scsi: scsi_debug: Add per_host_store option") Signed-off-by: Maurizio Lombardi <mlombard@redhat.com> --- drivers/scsi/scsi_debug.c | 8 -------- 1 file changed, 8 deletions(-)