mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-22 05:01:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'svn-trunk'

Browse Source
This commit is contained in:
Bart Van Assche
2020-11-26 19:28:23 -08:00
parent 3be1f4b695 02f350c8a7
commit fcdeb4148b
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
scst/src/dev_handlers/scst_vdisk.c
View File

@@ -3162,7 +3162,7 @@ static bool do_fileio_async(const struct vdisk_cmd_params *p)
}
}
static bool vdisk_alloc_kvec(struct scst_cmd *cmd, struct vdisk_cmd_params *p)
static bool vdisk_alloc_async_kvec(struct scst_cmd *cmd, struct vdisk_cmd_params *p)
{
int n;
@@ -3239,7 +3239,7 @@ static enum compl_status_e fileio_exec_async(struct vdisk_cmd_params *p)
return CMD_FAILED;
}
if (!vdisk_alloc_kvec(cmd, p)) {
if (!vdisk_alloc_async_kvec(cmd, p)) {
scst_set_busy(cmd);
return CMD_SUCCEEDED;
}
@@ -5195,8 +5195,8 @@ static enum compl_status_e vdisk_exec_prevent_allow_medium_removal(struct vdisk_
return CMD_SUCCEEDED;
}
static struct iovec *vdisk_alloc_iv(struct scst_cmd *cmd,
struct vdisk_cmd_params *p)
static struct iovec *vdisk_alloc_sync_kvec(struct scst_cmd *cmd,
struct vdisk_cmd_params *p)
{
int iv_count;
@@ -5285,7 +5285,7 @@ static int vdev_read_dif_tags(struct vdisk_cmd_params *p)
iv = p->sync.iv;
if (iv == NULL) {
iv = vdisk_alloc_iv(cmd, p);
iv = vdisk_alloc_sync_kvec(cmd, p);
if (iv == NULL) {
unsigned long flags;
@@ -5399,7 +5399,7 @@ static int vdev_write_dif_tags(struct vdisk_cmd_params *p)
iv = p->sync.iv;
if (iv == NULL) {
iv = vdisk_alloc_iv(cmd, p);
iv = vdisk_alloc_sync_kvec(cmd, p);
if (iv == NULL) {
unsigned long flags;
@@ -5578,7 +5578,7 @@ static enum compl_status_e fileio_exec_write(struct vdisk_cmd_params *p)
if (unlikely(rc != 0))
goto out;
iv = vdisk_alloc_iv(cmd, p);
iv = vdisk_alloc_sync_kvec(cmd, p);
if (iv == NULL)
goto out_nomem;
@@ -6285,7 +6285,7 @@ static enum compl_status_e fileio_exec_read(struct vdisk_cmd_params *p)
if (do_fileio_async(p))
return fileio_exec_async(p);
iv = vdisk_alloc_iv(cmd, p);
iv = vdisk_alloc_sync_kvec(cmd, p);
if (iv == NULL)
goto out_nomem;