|
 |
470c3f7 |
From a69f6aeb19841f5a95c3eb4f4e5fe5ca0db247f4 Mon Sep 17 00:00:00 2001
|
|
|
470c3f7 |
From: Jim Rees <rees@umich.edu>
|
|
|
470c3f7 |
Date: Tue, 15 May 2012 10:10:01 -0400
|
|
|
470c3f7 |
Subject: [PATCH 1/1] blkmapd: remove pretty_sig()
|
|
|
470c3f7 |
|
|
|
470c3f7 |
This really only works against EMC servers. There is at least one server
|
|
|
470c3f7 |
that returns unprintable signatures, which fill the log with garbage (the
|
|
|
470c3f7 |
spec does not mandate printable signatures). It could be made more generic,
|
|
|
470c3f7 |
for example by checking each byte for isprint(). But the signatures are
|
|
|
470c3f7 |
really only of interest to developers, not admins, so it seems better to
|
|
|
470c3f7 |
just remove it.
|
|
|
470c3f7 |
|
|
|
470c3f7 |
Signed-off-by: Jim Rees <rees@umich.edu>
|
|
|
470c3f7 |
Signed-off-by: Steve Dickson <steved@redhat.com>
|
|
|
470c3f7 |
---
|
|
|
470c3f7 |
utils/blkmapd/device-process.c | 29 -----------------------------
|
|
|
470c3f7 |
1 files changed, 0 insertions(+), 29 deletions(-)
|
|
|
470c3f7 |
|
|
|
470c3f7 |
diff --git a/utils/blkmapd/device-process.c b/utils/blkmapd/device-process.c
|
|
|
470c3f7 |
index 652a7a8..5fe3dff 100644
|
|
|
470c3f7 |
--- a/utils/blkmapd/device-process.c
|
|
|
470c3f7 |
+++ b/utils/blkmapd/device-process.c
|
|
|
470c3f7 |
@@ -49,28 +49,6 @@
|
|
|
470c3f7 |
|
|
|
470c3f7 |
#include "device-discovery.h"
|
|
|
470c3f7 |
|
|
|
470c3f7 |
-static char *pretty_sig(char *sig, uint32_t siglen)
|
|
|
470c3f7 |
-{
|
|
|
470c3f7 |
- static char rs[100];
|
|
|
470c3f7 |
- uint64_t sigval;
|
|
|
470c3f7 |
- unsigned int i;
|
|
|
470c3f7 |
-
|
|
|
470c3f7 |
- if (siglen <= sizeof(sigval)) {
|
|
|
470c3f7 |
- sigval = 0;
|
|
|
470c3f7 |
- for (i = 0; i < siglen; i++)
|
|
|
470c3f7 |
- sigval |= ((unsigned char *)sig)[i] << (i * 8);
|
|
|
470c3f7 |
- sprintf(rs, "0x%0llx", (unsigned long long) sigval);
|
|
|
470c3f7 |
- } else {
|
|
|
470c3f7 |
- if (siglen > sizeof rs - 4) {
|
|
|
470c3f7 |
- siglen = sizeof rs - 4;
|
|
|
470c3f7 |
- sprintf(&rs[siglen], "...");
|
|
|
470c3f7 |
- } else
|
|
|
470c3f7 |
- rs[siglen] = '\0';
|
|
|
470c3f7 |
- memcpy(rs, sig, siglen);
|
|
|
470c3f7 |
- }
|
|
|
470c3f7 |
- return rs;
|
|
|
470c3f7 |
-}
|
|
|
470c3f7 |
-
|
|
|
470c3f7 |
uint32_t *blk_overflow(uint32_t * p, uint32_t * end, size_t nbytes)
|
|
|
470c3f7 |
{
|
|
|
470c3f7 |
uint32_t *q = p + ((nbytes + 3) >> 2);
|
|
|
470c3f7 |
@@ -109,9 +87,6 @@ static int decode_blk_signature(uint32_t **pp, uint32_t * end,
|
|
|
470c3f7 |
* for mapping, then thrown away.
|
|
|
470c3f7 |
*/
|
|
|
470c3f7 |
comp->bs_string = (char *)p;
|
|
|
470c3f7 |
- BL_LOG_INFO("%s: si_comps[%d]: bs_length %d, bs_string %s\n",
|
|
|
470c3f7 |
- __func__, i, siglen,
|
|
|
470c3f7 |
- pretty_sig(comp->bs_string, siglen));
|
|
|
470c3f7 |
p += ((siglen + 3) >> 2);
|
|
|
470c3f7 |
}
|
|
|
470c3f7 |
*pp = p;
|
|
|
470c3f7 |
@@ -152,10 +127,6 @@ read_cmp_blk_sig(struct bl_disk *disk, int fd, struct bl_sig_comp *comp)
|
|
|
470c3f7 |
}
|
|
|
470c3f7 |
|
|
|
470c3f7 |
ret = memcmp(sig, comp->bs_string, siglen);
|
|
|
470c3f7 |
- if (!ret)
|
|
|
470c3f7 |
- BL_LOG_INFO("%s: %s sig %s at %lld\n", __func__, dev_name,
|
|
|
470c3f7 |
- pretty_sig(sig, siglen),
|
|
|
470c3f7 |
- (long long)comp->bs_offset);
|
|
|
470c3f7 |
|
|
|
470c3f7 |
out:
|
|
|
470c3f7 |
if (sig)
|
|
|
470c3f7 |
--
|
|
|
470c3f7 |
1.7.7.6
|
|
|
470c3f7 |
|