51 lines
1.5 KiB
Diff
51 lines
1.5 KiB
Diff
From 2592bb42051b3e6d17240badc814b9b16f121c1d Mon Sep 17 00:00:00 2001
|
|
From: "Richard W.M. Jones" <rjones@redhat.com>
|
|
Date: Tue, 27 Jul 2021 21:16:30 +0100
|
|
Subject: [PATCH] cache: Refactor printing state into new function
|
|
|
|
This minor refactoring just makes the cache and cow filters' blk.c a
|
|
little bit more similar.
|
|
|
|
(cherry picked from commit bdb86ea14c00a950f2a2d34071ac1e0799d29132)
|
|
---
|
|
filters/cache/blk.c | 16 ++++++++++++----
|
|
1 file changed, 12 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/filters/cache/blk.c b/filters/cache/blk.c
|
|
index 6276985f..e50a7f24 100644
|
|
--- a/filters/cache/blk.c
|
|
+++ b/filters/cache/blk.c
|
|
@@ -94,6 +94,17 @@ enum bm_entry {
|
|
BLOCK_DIRTY = 3,
|
|
};
|
|
|
|
+static const char *
|
|
+state_to_string (enum bm_entry state)
|
|
+{
|
|
+ switch (state) {
|
|
+ case BLOCK_NOT_CACHED: return "not cached";
|
|
+ case BLOCK_CLEAN: return "clean";
|
|
+ case BLOCK_DIRTY: return "dirty";
|
|
+ default: abort ();
|
|
+ }
|
|
+}
|
|
+
|
|
/* Extra debugging (-D cache.verbose=1). */
|
|
NBDKIT_DLL_PUBLIC int cache_debug_verbose = 0;
|
|
|
|
@@ -312,10 +323,7 @@ blk_cache (nbdkit_next *next,
|
|
nbdkit_debug ("cache: blk_cache block %" PRIu64
|
|
" (offset %" PRIu64 ") is %s",
|
|
blknum, (uint64_t) offset,
|
|
- state == BLOCK_NOT_CACHED ? "not cached" :
|
|
- state == BLOCK_CLEAN ? "clean" :
|
|
- state == BLOCK_DIRTY ? "dirty" :
|
|
- "unknown");
|
|
+ state_to_string (state));
|
|
|
|
if (state == BLOCK_NOT_CACHED) {
|
|
/* Read underlying plugin, copy to cache regardless of cache-on-read. */
|
|
--
|
|
2.31.1
|
|
|