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

Merge branch 'svn-trunk'

Browse Source
This commit is contained in:
Bart Van Assche
2021-04-14 13:36:21 -07:00
parent b4c8b19a7d f59fe00eb1
commit abe2950cb3
3 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
iscsi-scst/kernel/digest.c
View File

@@ -39,12 +39,9 @@ void digest_alg_available(int *val)
}
/**
* initialize support for digest calculation.
*
* digest_init -
* digest_init - initialize support for digest calculation.
* @conn: ptr to connection to make use of digests
*
* @return: 0 on success, < 0 on error
* Returns: 0 on success, < 0 on error
*/
int digest_init(struct iscsi_conn *conn)
{

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

@@ -488,8 +488,10 @@ static int vdisk_blockio_flush(struct block_device *bdev, gfp_t gfp_mask,
res = blkdev_issue_flush(bdev, gfp_mask, NULL, BLKDEV_IFL_WAIT);
#elif LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
res = blkdev_issue_flush(bdev, gfp_mask, NULL);
#else
#elif LINUX_VERSION_CODE < KERNEL_VERSION(5, 12, 0)
res = blkdev_issue_flush(bdev, gfp_mask);
#else
res = blkdev_issue_flush(bdev);
#endif
}

12
scst/src/scst_lib.c
View File

@@ -4657,7 +4657,7 @@ static int scst_tgt_devs_cmds(struct list_head *tgt_dev_list)
static void scst_wait_for_tgt_devs(struct list_head *tgt_dev_list)
{
while (scst_tgt_devs_cmds(tgt_dev_list) > 0)
mdelay(100);
msleep(100);
}
int scst_acg_del_lun(struct scst_acg *acg, uint64_t lun,
@@ -14583,11 +14583,11 @@ static void scst_free_descriptors(struct scst_cmd *cmd)
return;
}
/**
** We currently have only few saved parameters and it is impossible to get
** pointer on a bit field, so let's have a simple straightforward
** implementation.
**/
/*
* We currently have only few saved parameters and it is impossible to get
* pointer on a bit field, so let's have a simple straightforward
* implementation.
*/
#define SCST_TAS_LABEL "TAS"
#define SCST_QERR_LABEL "QERR"