projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'vmwgfx-next-2014-07-04' of git://people.freedesktop.org/~thomash/linux...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
vhost
/
scsi.c
diff --git
a/drivers/vhost/scsi.c
b/drivers/vhost/scsi.c
index 4f4ffa4c604e081755a3b77dba0fccb24c6ded7d..69906cacd04fdc8b3d5236dc030e8bcf749c541f 100644
(file)
--- a/
drivers/vhost/scsi.c
+++ b/
drivers/vhost/scsi.c
@@
-1503,14
+1503,6
@@
static int vhost_scsi_set_features(struct vhost_scsi *vs, u64 features)
return 0;
}
return 0;
}
-static void vhost_scsi_free(struct vhost_scsi *vs)
-{
- if (is_vmalloc_addr(vs))
- vfree(vs);
- else
- kfree(vs);
-}
-
static int vhost_scsi_open(struct inode *inode, struct file *f)
{
struct vhost_scsi *vs;
static int vhost_scsi_open(struct inode *inode, struct file *f)
{
struct vhost_scsi *vs;
@@
-1550,7
+1542,7
@@
static int vhost_scsi_open(struct inode *inode, struct file *f)
return 0;
err_vqs:
return 0;
err_vqs:
-
vhost_scsi_
free(vs);
+
kv
free(vs);
err_vs:
return r;
}
err_vs:
return r;
}
@@
-1569,7
+1561,7
@@
static int vhost_scsi_release(struct inode *inode, struct file *f)
/* Jobs can re-queue themselves in evt kick handler. Do extra flush. */
vhost_scsi_flush(vs);
kfree(vs->dev.vqs);
/* Jobs can re-queue themselves in evt kick handler. Do extra flush. */
vhost_scsi_flush(vs);
kfree(vs->dev.vqs);
-
vhost_scsi_
free(vs);
+
kv
free(vs);
return 0;
}
return 0;
}