diff options
author | wangyan <wangyan122@huawei.com> | 2018-12-12 20:10:14 -0500 |
---|---|---|
committer | Michael S. Tsirkin <mst@redhat.com> | 2018-12-19 18:23:50 -0500 |
commit | a691ffb46edd7cb12a17ff0965ab59dbc95f48de (patch) | |
tree | 6b5a56b119ffb67fb0293f8d995db58dfbfb66a9 | |
parent | 4b86713236e4bd6ea6c881a97711ae039fc4069b (diff) |
vhost: correct the related warning message
Fixes: 'commit d588cf8f618d ("target: Fix se_tpg_tfo->tf_subsys regression + remove tf_subsystem")'
'commit cbbd26b8b1a6 ("[iov_iter] new primitives - copy_from_iter_full() and friends")'
Signed-off-by: Yan Wang <wangyan122@huawei.com>
Reviewed-by: Jun Piao <piaojun@huawei.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
-rw-r--r-- | drivers/vhost/scsi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/vhost/scsi.c b/drivers/vhost/scsi.c index 50dffe83714c..b459b6919b91 100644 --- a/drivers/vhost/scsi.c +++ b/drivers/vhost/scsi.c | |||
@@ -889,7 +889,7 @@ vhost_scsi_get_req(struct vhost_virtqueue *vq, struct vhost_scsi_ctx *vc, | |||
889 | 889 | ||
890 | if (unlikely(!copy_from_iter_full(vc->req, vc->req_size, | 890 | if (unlikely(!copy_from_iter_full(vc->req, vc->req_size, |
891 | &vc->out_iter))) { | 891 | &vc->out_iter))) { |
892 | vq_err(vq, "Faulted on copy_from_iter\n"); | 892 | vq_err(vq, "Faulted on copy_from_iter_full\n"); |
893 | } else if (unlikely(*vc->lunp != 1)) { | 893 | } else if (unlikely(*vc->lunp != 1)) { |
894 | /* virtio-scsi spec requires byte 0 of the lun to be 1 */ | 894 | /* virtio-scsi spec requires byte 0 of the lun to be 1 */ |
895 | vq_err(vq, "Illegal virtio-scsi lun: %u\n", *vc->lunp); | 895 | vq_err(vq, "Illegal virtio-scsi lun: %u\n", *vc->lunp); |
@@ -1441,7 +1441,7 @@ vhost_scsi_set_endpoint(struct vhost_scsi *vs, | |||
1441 | se_tpg = &tpg->se_tpg; | 1441 | se_tpg = &tpg->se_tpg; |
1442 | ret = target_depend_item(&se_tpg->tpg_group.cg_item); | 1442 | ret = target_depend_item(&se_tpg->tpg_group.cg_item); |
1443 | if (ret) { | 1443 | if (ret) { |
1444 | pr_warn("configfs_depend_item() failed: %d\n", ret); | 1444 | pr_warn("target_depend_item() failed: %d\n", ret); |
1445 | kfree(vs_tpg); | 1445 | kfree(vs_tpg); |
1446 | mutex_unlock(&tpg->tv_tpg_mutex); | 1446 | mutex_unlock(&tpg->tv_tpg_mutex); |
1447 | goto out; | 1447 | goto out; |