[multipath] correct map size display

off-by-one shifting error.

diff --git a/libmultipath/discovery.c b/libmultipath/discovery.c
index 77d133a..f171afa 100644 (file)
--- a/libmultipath/discovery.c
+++ b/libmultipath/discovery.c
@@ -334,7 +334,7 @@ get_serial (char * str, int fd)
                len = buff[3];
                if (len > 0) {
                        memcpy(str, buff + 4, len);
-                       buff[len] = '\0';
+                       str[len] = '\0';
                }
                return 1;
        }

diff --git a/multipath/main.c b/multipath/main.c
index e71c296..557c8cd 100644 (file)
--- a/multipath/main.c
+++ b/multipath/main.c
@@ -229,13 +229,13 @@ print_mp (struct multipath * mpp)
        printf("\n");
 
        if (mpp->size < (1 << 11))
-               printf("[size=%llu kB]", mpp->size);
+               printf("[size=%llu kB]", mpp->size >> 1);
        else if (mpp->size < (1 << 21))
-               printf("[size=%llu MB]", mpp->size >> 10);
+               printf("[size=%llu MB]", mpp->size >> 11);
        else if (mpp->size < (1 << 31))
-               printf("[size=%llu GB]", mpp->size >> 20);
+               printf("[size=%llu GB]", mpp->size >> 21);
        else
-               printf("[size=%llu TB]", mpp->size >> 30);
+               printf("[size=%llu TB]", mpp->size >> 31);
 
        if (mpp->features)
                printf("[features=\"%s\"]", mpp->features);