github/ocf
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #342 from mmichal10/fix-metadata-flush

Browse Source 
Fix metadata flush
This commit is contained in:
Michał Wysoczański
2020-01-24 17:59:58 +01:00
committed by GitHub
parent 30f884ba84 d9c987e068
commit fabd41250b
2 changed files with 75 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/metadata/metadata_status.h
View File

@@ -200,49 +200,47 @@ static inline bool metadata_test_and_clear_dirty_sec(
/*
* Marks given cache line's bits as clean
*
* @return true if the cache line was dirty and became clean
* @return true if any cache line's sector was dirty and became clean
* @return false for other cases
*/
static inline bool metadata_clear_dirty_sec_changed(
struct ocf_cache *cache, ocf_cache_line_t line,
uint8_t start, uint8_t stop)
uint8_t start, uint8_t stop, bool *line_is_clean)
{
bool was_dirty, is_dirty = false;
bool sec_changed;
OCF_METADATA_BITS_LOCK_WR();
was_dirty = cache->metadata.iface.test_dirty(cache, line,
cache->metadata.settings.sector_start,
cache->metadata.settings.sector_end,
false);
if (was_dirty) {
is_dirty = cache->metadata.iface.clear_dirty(cache, line,
start, stop);
}
sec_changed = cache->metadata.iface.test_dirty(cache, line,
start, stop, false);
*line_is_clean = !cache->metadata.iface.clear_dirty(cache, line,
start, stop);
OCF_METADATA_BITS_UNLOCK_WR();
return was_dirty && !is_dirty;
return sec_changed;
}
/*
* Marks given cache line's bits as dirty
*
* @return true if the cache line was clean and became dirty
* @return false if the cache line was dirty before marking bits
* @return true if any cache line's sector became dirty
* @return false for other cases
*/
static inline bool metadata_set_dirty_sec_changed(
struct ocf_cache *cache, ocf_cache_line_t line,
uint8_t start, uint8_t stop)
uint8_t start, uint8_t stop, bool *line_was_dirty)
{
bool was_dirty;
bool sec_changed;
OCF_METADATA_BITS_LOCK_WR();
was_dirty = cache->metadata.iface.set_dirty(cache, line, start, stop);
sec_changed = !cache->metadata.iface.test_dirty(cache, line,
start, stop, true);
*line_was_dirty = cache->metadata.iface.set_dirty(cache, line, start,
stop);
OCF_METADATA_BITS_UNLOCK_WR();
return !was_dirty;
return sec_changed;
}
/*******************************************************************************