tcm_vhost: Use vs for struct vhost_scsi
Subsystems (3)
PATCH 1/1 tcm_vhost: Use vs for struct vhost_scsi
Use vs for struct vhost_scsi, instead of s. vs is used everywhere, make the naming more consistent.
Signed-off-by Asias He <[email protected]>
--- drivers/vhost/tcm_vhost.c | 48 +++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-)
drivers/vhost/tcm_vhost.c +24 -24
@@ -1194,48 +1194,48 @@ err_dev:static int vhost_scsi_open (struct inode *inode,struct file *f) { -struct vhost_scsi *s; +struct vhost_scsi *vs;int r, i; - s =kzalloc (sizeof (*s),GFP_KERNEL ); -if (!s) + vs =kzalloc (sizeof (*vs),GFP_KERNEL ); +if (!vs)return -ENOMEM ; -vhost_work_init (&s->vs_completion_work, vhost_scsi_complete_cmd_work); -vhost_work_init (&s->vs_event_work, tcm_vhost_evt_work); +vhost_work_init (&vs->vs_completion_work, vhost_scsi_complete_cmd_work); +vhost_work_init (&vs->vs_event_work, tcm_vhost_evt_work); - s->vs_events_nr =0 ; - s->vs_inflight[0 ] =0 ; - s->vs_inflight[1 ] =0 ; -spin_lock_init (&s->vs_flush_lock); -init_waitqueue_head (&s->vs_flush_wait); + vs->vs_events_nr =0 ; + vs->vs_inflight[0 ] =0 ; + vs->vs_inflight[1 ] =0 ; +spin_lock_init (&vs->vs_flush_lock); +init_waitqueue_head (&vs->vs_flush_wait); - s->vqs[VHOST_SCSI_VQ_CTL ].handle_kick = vhost_scsi_ctl_handle_kick; - s->vqs[VHOST_SCSI_VQ_EVT ].handle_kick = vhost_scsi_evt_handle_kick; + vs->vqs[VHOST_SCSI_VQ_CTL ].handle_kick = vhost_scsi_ctl_handle_kick; + vs->vqs[VHOST_SCSI_VQ_EVT ].handle_kick = vhost_scsi_evt_handle_kick;for (i =VHOST_SCSI_VQ_IO ; i <VHOST_SCSI_MAX_VQ ; i++) - s->vqs[i].handle_kick = vhost_scsi_handle_kick; - r =vhost_dev_init (&s->dev, s->vqs,VHOST_SCSI_MAX_VQ ); + vs->vqs[i].handle_kick = vhost_scsi_handle_kick; + r =vhost_dev_init (&vs->dev, vs->vqs,VHOST_SCSI_MAX_VQ );if (r <0 ) { -kfree (s); +kfree (vs);return r; } - f->private_data = s; + f->private_data = vs;return 0 ; }static int vhost_scsi_release (struct inode *inode,struct file *f) { -struct vhost_scsi *s = f->private_data; +struct vhost_scsi *vs = f->private_data;struct vhost_scsi_target t; -mutex_lock (&s->dev.mutex); -memcpy (t.vhost_wwpn, s->vs_vhost_wwpn,sizeof (t.vhost_wwpn)); -mutex_unlock (&s->dev.mutex); -vhost_scsi_clear_endpoint (s, &t); -vhost_dev_stop (&s->dev); -vhost_dev_cleanup (&s->dev, false); -kfree (s); +mutex_lock (&vs->dev.mutex); +memcpy (t.vhost_wwpn, vs->vs_vhost_wwpn,sizeof (t.vhost_wwpn)); +mutex_unlock (&vs->dev.mutex); +vhost_scsi_clear_endpoint (vs, &t); +vhost_dev_stop (&vs->dev); +vhost_dev_cleanup (&vs->dev, false); +kfree (vs);return 0 ; }
Signature · 1 line
1.8.1.4