31 lines
1.0 KiB
Diff
31 lines
1.0 KiB
Diff
From 86983cce34645efb2b270a737d573e01eeee96e5 Mon Sep 17 00:00:00 2001
|
|
From: NeilBrown <neilb@suse.de>
|
|
Date: Wed, 24 Mar 2010 09:07:02 +1100
|
|
Subject: [PATCH 1/6]
|
|
|
|
---
|
|
util.c | 7 ++++++-
|
|
1 files changed, 6 insertions(+), 1 deletions(-)
|
|
|
|
diff --git a/util.c b/util.c
|
|
index d292a66..79d2b0f 100644
|
|
--- a/util.c
|
|
+++ b/util.c
|
|
@@ -425,7 +425,12 @@ char *__fname_from_uuid(int id[4], int swap, char *buf, char sep)
|
|
|
|
char *fname_from_uuid(struct supertype *st, struct mdinfo *info, char *buf, char sep)
|
|
{
|
|
- return __fname_from_uuid(info->uuid, st->ss->swapuuid, buf, sep);
|
|
+ // dirty hack to work around an issue with super1 superblocks...
|
|
+ // super1 superblocks need swapuuid set in order for assembly to
|
|
+ // work, but can't have it set if we want this printout to match
|
|
+ // all the other uuid printouts in super1.c, so we force swapuuid
|
|
+ // to 1 to make our printout match the rest of super1
|
|
+ return __fname_from_uuid(info->uuid, (st->ss == &super1) ? 1 : st->ss->swapuuid, buf, sep);
|
|
}
|
|
|
|
#ifndef MDASSEMBLE
|
|
--
|
|
1.6.6.1
|
|
|