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

Merge pull request #382 from robertbaldyga/update-ocf-flush-deadlock

Browse Source 
Update OCF and handle new error code
This commit is contained in:
Robert Baldyga 2020-04-06 10:05:32 +02:00 committed by GitHub
commit 162f0a477a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
casadm/extended_err_msg.c
View File

@ -108,6 +108,10 @@ struct {
OCF_ERR_FLUSHING_INTERRUPTED, OCF_ERR_FLUSHING_INTERRUPTED,
"Flushing of core interrupted" "Flushing of core interrupted"
}, },
{
OCF_ERR_FLUSH_IN_PROGRESS,
"Another flush operation in progress"
},
{ {
OCF_ERR_CANNOT_ADD_CORE_TO_POOL, OCF_ERR_CANNOT_ADD_CORE_TO_POOL,
"Error occurred during adding core device to core pool" "Error occurred during adding core device to core pool"

1
modules/cas_cache/utils/cas_err.h
View File

@ -40,6 +40,7 @@ struct {
{ OCF_ERR_DIRTY_SHUTDOWN, EFAULT }, { OCF_ERR_DIRTY_SHUTDOWN, EFAULT },
{ OCF_ERR_DIRTY_EXISTS, EFAULT }, { OCF_ERR_DIRTY_EXISTS, EFAULT },
{ OCF_ERR_FLUSHING_INTERRUPTED, EINTR }, { OCF_ERR_FLUSHING_INTERRUPTED, EINTR },
{ OCF_ERR_FLUSH_IN_PROGRESS, EBUSY },
{ OCF_ERR_CANNOT_ADD_CORE_TO_POOL, EFAULT }, { OCF_ERR_CANNOT_ADD_CORE_TO_POOL, EFAULT },
{ OCF_ERR_CACHE_IN_INCOMPLETE_STATE, ENODEV }, { OCF_ERR_CACHE_IN_INCOMPLETE_STATE, ENODEV },
{ OCF_ERR_CORE_IN_INACTIVE_STATE, ENODEV }, { OCF_ERR_CORE_IN_INACTIVE_STATE, ENODEV },

2
ocf

@ -1 +1 @@
Subproject commit 53dc4020e3fb5b31846dfc39137e57ab8c8b6fe1 Subproject commit 72f11d0771945021949dafec54378acb9e30b97a