From aa3e2d589dc0363bdc118bce90d97dc4fd4712c0 Mon Sep 17 00:00:00 2001 From: Jacob Malevich Date: Tue, 13 Jan 2015 17:22:20 -0800 Subject: [PATCH] bcacheadm: fix status command Don't say that the device is missing unless it is still showing "active" state. Change-Id: I708d7719c6f6804cd06e75cbadf7bea36ac4b62d Signed-off-by: Jacob Malevich --- bcacheadm.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/bcacheadm.c b/bcacheadm.c index d974d99c..97e57321 100644 --- a/bcacheadm.c +++ b/bcacheadm.c @@ -672,10 +672,15 @@ int bcache_status(NihCommand *command, char *const *args) for (j = 0; j < dev_count; j++) { if (!strcmp(uuid_str, dev_uuids[j])) { - snprintf(dev_state, MAX_PATH, "%s", cache_state[CACHE_STATE(m)]); + snprintf(dev_state, MAX_PATH, "%s", + cache_state[CACHE_STATE(m)]); break; } else if (j == dev_count - 1) { - snprintf(dev_state, MAX_PATH, "%s", "missing"); + if (!strcmp(cache_state[CACHE_STATE(m)], "active")) + snprintf(dev_state, MAX_PATH, "%s", "missing"); + else + snprintf(dev_state, MAX_PATH, "%s", + cache_state[CACHE_STATE(m)]); break; } }