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

Cleanups

Browse Source 
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@5482 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Vladislav Bolkhovitin
2014-04-26 02:12:17 +00:00
parent 34f682c19e
commit 72a57986e5
2 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3364,20 +3364,6 @@ static int __dev_user_set_opt(struct scst_user_dev *dev,
goto out;
}
if (((opt->tst != SCST_TST_0_SINGLE_TASK_SET) &&
(opt->tst != SCST_TST_1_SEP_TASK_SETS)) ||
((opt->queue_alg != SCST_QUEUE_ALG_0_RESTRICTED_REORDER) &&
(opt->queue_alg != SCST_QUEUE_ALG_1_UNRESTRICTED_REORDER)) ||
(opt->swp > 1) || (opt->tas > 1) || (opt->has_own_order_mgmt > 1) ||
(opt->d_sense > 1)) {
PRINT_ERROR("Invalid SCSI option (tst %x, queue_alg %x, swp %x,"
" tas %x, d_sense %d, has_own_order_mgmt %x)", opt->tst,
opt->queue_alg, opt->swp, opt->tas, opt->d_sense,
opt->has_own_order_mgmt);
res = -EINVAL;
goto out;
}
if (((opt->tst != SCST_TST_0_SINGLE_TASK_SET) &&
(opt->tst != SCST_TST_1_SEP_TASK_SETS)) ||
(opt->tmf_only > 1) ||
@@ -3392,6 +3378,8 @@ static int __dev_user_set_opt(struct scst_user_dev *dev,
"has_own_order_mgmt %x)",
opt->tst, opt->tmf_only, opt->queue_alg, opt->qerr,
opt->swp, opt->tas, opt->d_sense, opt->has_own_order_mgmt);
res = -EINVAL;
goto out;
}
#if 1

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

@@ -4083,7 +4083,7 @@ static void vdisk_ctrl_m_pg_select(unsigned char *p,
if ((dev->swp == old_swp) && (dev->tas == old_tas) &&
(dev->d_sense == old_dsense) && (dev->queue_alg == old_queue_alg) &&
(dev->qerr == old_qerr) && dev->tmf_only == old_tmf_only)
(dev->qerr == old_qerr) && (dev->tmf_only == old_tmf_only))
goto out;
if (!save)