github/open-cas-linux
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove upgrade-in-flight feature

Browse Source 
Due to changes in Linux kernel this feature is not working anymore.

Signed-off-by: Robert Baldyga <robert.baldyga@intel.com>
This commit is contained in:
Robert Baldyga
2021-08-11 20:33:16 +02:00
parent 5afc8af0e8
commit c968285d9f
24 changed files with 13 additions and 3336 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
modules/cas_cache/volume/vol_block_dev_bottom.c
View File

@@ -33,13 +33,7 @@ int block_dev_open_object(ocf_volume_t vol, void *volume_params)
return 0;
}
if (unlikely(true == cas_upgrade_is_in_upgrade())) {
dsk = casdisk_functions.casdsk_disk_claim(uuid->data, NULL);
casdisk_functions.casdsk_disk_set_attached(dsk);
} else {
dsk = casdisk_functions.casdsk_disk_open(uuid->data, NULL);
}
dsk = casdisk_functions.casdsk_disk_open(uuid->data, NULL);
if (IS_ERR_OR_NULL(dsk)) {
int error = PTR_ERR(dsk) ?: -EINVAL;
@@ -62,12 +56,7 @@ void block_dev_close_object(ocf_volume_t vol)
if (bdobj->opened_by_bdev)
return;
if (likely(!cas_upgrade_is_in_upgrade())) {
casdisk_functions.casdsk_disk_close(bdobj->dsk);
} else {
casdisk_functions.casdsk_disk_set_pt(bdobj->dsk);
casdisk_functions.casdsk_disk_detach(bdobj->dsk);
}
casdisk_functions.casdsk_disk_close(bdobj->dsk);
}
unsigned int block_dev_get_max_io_size(ocf_volume_t vol)

15
modules/cas_cache/volume/vol_block_dev_top.c
View File

@@ -458,16 +458,10 @@ int block_dev_activate_exported_object(ocf_core_t core)
ocf_cache_t cache = ocf_core_get_cache(core);
struct bd_object *bvol = bd_object(obj);
if (!cas_upgrade_is_in_upgrade()) {
ret = casdisk_functions.casdsk_exp_obj_activate(bvol->dsk);
ret = casdisk_functions.casdsk_exp_obj_activate(bvol->dsk);
if (ret) {
if (-EEXIST == ret)
ret = KCAS_ERR_FILE_EXISTS;
} else {
ret = casdisk_functions.casdsk_disk_attach(bvol->dsk, THIS_MODULE,
&_blockdev_exp_obj_ops);
}
if (ret) {
printk(KERN_ERR "Cannot activate exported object, %s.%s. "
"Error code %d\n", ocf_cache_get_name(cache),
ocf_core_get_name(core), ret);
@@ -506,11 +500,6 @@ int block_dev_create_exported_object(ocf_core_t core)
goto end;
}
if (cas_upgrade_is_in_upgrade()) {
bvol->expobj_valid = true;
return 0;
}
bvol->expobj_wq = alloc_workqueue("expobj_wq%s-%s",
WQ_MEM_RECLAIM | WQ_HIGHPRI, 0,
get_cache_id_string(cache),