FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-23 09:56:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

vhost-scsi: Rename struct vhost_scsi *s to *vs

Browse Source 
vs is used everywhere, make the naming more consistent.

Signed-off-by: Asias He <asias@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Asias He 2013-05-06 16:38:26 +08:00 committed by Michael S. Tsirkin
parent deeacef086
commit c7289312fe
1 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
drivers/vhost/scsi.c
View File

@ -1337,63 +1337,63 @@ static int vhost_scsi_set_features(struct vhost_scsi *vs, u64 features)
static int vhost_scsi_open(struct inode *inode, struct file *f) static int vhost_scsi_open(struct inode *inode, struct file *f)
{ {
struct vhost_scsi *s; struct vhost_scsi *vs;
struct vhost_virtqueue **vqs; struct vhost_virtqueue **vqs;
int r, i; int r, i;
s = kzalloc(sizeof(*s), GFP_KERNEL); vs = kzalloc(sizeof(*vs), GFP_KERNEL);
if (!s) if (!vs)
return -ENOMEM; return -ENOMEM;
vqs = kmalloc(VHOST_SCSI_MAX_VQ * sizeof(*vqs), GFP_KERNEL); vqs = kmalloc(VHOST_SCSI_MAX_VQ * sizeof(*vqs), GFP_KERNEL);
if (!vqs) { if (!vqs) {
kfree(s); kfree(vs);
return -ENOMEM; return -ENOMEM;
} }
vhost_work_init(&s->vs_completion_work, vhost_scsi_complete_cmd_work); vhost_work_init(&vs->vs_completion_work, vhost_scsi_complete_cmd_work);
vhost_work_init(&s->vs_event_work, tcm_vhost_evt_work); vhost_work_init(&vs->vs_event_work, tcm_vhost_evt_work);
s->vs_events_nr = 0; vs->vs_events_nr = 0;
s->vs_events_missed = false; vs->vs_events_missed = false;
vqs[VHOST_SCSI_VQ_CTL] = &s->vqs[VHOST_SCSI_VQ_CTL].vq; vqs[VHOST_SCSI_VQ_CTL] = &vs->vqs[VHOST_SCSI_VQ_CTL].vq;
vqs[VHOST_SCSI_VQ_EVT] = &s->vqs[VHOST_SCSI_VQ_EVT].vq; vqs[VHOST_SCSI_VQ_EVT] = &vs->vqs[VHOST_SCSI_VQ_EVT].vq;
s->vqs[VHOST_SCSI_VQ_CTL].vq.handle_kick = vhost_scsi_ctl_handle_kick; vs->vqs[VHOST_SCSI_VQ_CTL].vq.handle_kick = vhost_scsi_ctl_handle_kick;
s->vqs[VHOST_SCSI_VQ_EVT].vq.handle_kick = vhost_scsi_evt_handle_kick; vs->vqs[VHOST_SCSI_VQ_EVT].vq.handle_kick = vhost_scsi_evt_handle_kick;
for (i = VHOST_SCSI_VQ_IO; i < VHOST_SCSI_MAX_VQ; i++) { for (i = VHOST_SCSI_VQ_IO; i < VHOST_SCSI_MAX_VQ; i++) {
vqs[i] = &s->vqs[i].vq; vqs[i] = &vs->vqs[i].vq;
s->vqs[i].vq.handle_kick = vhost_scsi_handle_kick; vs->vqs[i].vq.handle_kick = vhost_scsi_handle_kick;
} }
r = vhost_dev_init(&s->dev, vqs, VHOST_SCSI_MAX_VQ); r = vhost_dev_init(&vs->dev, vqs, VHOST_SCSI_MAX_VQ);
tcm_vhost_init_inflight(s, NULL); tcm_vhost_init_inflight(vs, NULL);
if (r < 0) { if (r < 0) {
kfree(vqs); kfree(vqs);
kfree(s); kfree(vs);
return r; return r;
} }
f->private_data = s; f->private_data = vs;
return 0; return 0;
} }
static int vhost_scsi_release(struct inode *inode, struct file *f) 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; struct vhost_scsi_target t;
mutex_lock(&s->dev.mutex); mutex_lock(&vs->dev.mutex);
memcpy(t.vhost_wwpn, s->vs_vhost_wwpn, sizeof(t.vhost_wwpn)); memcpy(t.vhost_wwpn, vs->vs_vhost_wwpn, sizeof(t.vhost_wwpn));
mutex_unlock(&s->dev.mutex); mutex_unlock(&vs->dev.mutex);
vhost_scsi_clear_endpoint(s, &t); vhost_scsi_clear_endpoint(vs, &t);
vhost_dev_stop(&s->dev); vhost_dev_stop(&vs->dev);
vhost_dev_cleanup(&s->dev, false); vhost_dev_cleanup(&vs->dev, false);
/* Jobs can re-queue themselves in evt kick handler. Do extra flush. */ /* Jobs can re-queue themselves in evt kick handler. Do extra flush. */
vhost_scsi_flush(s); vhost_scsi_flush(vs);
kfree(s->dev.vqs); kfree(vs->dev.vqs);
kfree(s); kfree(vs);
return 0; return 0;
} }