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

Merge branch 'svn-trunk'

Browse Source
This commit is contained in:
Bart Van Assche
2016-05-03 19:47:03 -07:00
parent 4b833bda28 33627cc8d8
commit bafdd8f15c
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scst/src/scst_lib.c
View File

@@ -4234,7 +4234,7 @@ void scst_free_device(struct scst_device *dev)
#endif
/* Ensure that ext_blockers_work is done */
flush_scheduled_work();
flush_work(&dev->ext_blockers_work);
scst_deinit_threads(&dev->dev_cmd_threads);

4
scst/src/scst_sysfs.c
View File

@@ -1432,14 +1432,14 @@ static int __scst_process_luns_mgmt_store(char *buffer,
}
case SCST_LUN_ACTION_REPLACE:
{
unsigned int flags = (read_only ? SCST_ADD_LUN_READ_ONLY : 0) |
(replace_gen_ua ? SCST_REPL_LUN_GEN_UA : 0);
unsigned int flags = replace_gen_ua ? SCST_REPL_LUN_GEN_UA : 0;
res = scst_parse_add_repl_param(acg, dev, pp, &virt_lun,
&read_only);
if (res != 0)
goto out_unlock;
flags |= read_only ? SCST_ADD_LUN_READ_ONLY : 0;
res = scst_acg_repl_lun(acg, tgt_kobj ? tgt->tgt_luns_kobj :
acg->luns_kobj, dev, virt_lun,
flags);