505f19f50d
- Update to latest mdadm which is requested by jsc#SLE-13700 from partners. Mostly the purpose is for latest Intel IMSM raid support, while some other fixes are important too. - imsm: Correct minimal device size (jsc#SLE-13700) 0073-imsm-Correct-minimal-device-size.patch - Detail: show correct bitmap info for cluster raid device (jsc#SLE-13700) 0074-Detail-show-correct-bitmap-info-for-cluster-raid-dev.patch - imsm: support the Array Creation Time field in metadata (jsc#SLE-13700) 0075-imsm-support-the-Array-Creation-Time-field-in-metada.patch - imsm: show Subarray and Volume ID in --examine output (jsc#SLE-13700) 0076-imsm-show-Subarray-and-Volume-ID-in-examine-output.patch - udev: Ignore change event for imsm (jsc#SLE-13700) 0077-udev-Ignore-change-event-for-imsm.patch - Manage, imsm: Write metadata before add (jsc#SLE-13700) 0078-Manage-imsm-Write-metadata-before-add.patch - Assemble: print error message if mdadm fails assembling with --uuid option (jsc#SLE-13700) 0079-Assemble-print-error-message-if-mdadm-fails-assembli.patch - clean up meaning of small typo (jsc#SLE-13700) 0080-clean-up-meaning-of-small-typo.patch - Assemble.c: respect force flag (jsc#SLE-13700) 0081-Assemble.c-respect-force-flag.patch - mdcheck: Log when done (jsc#SLE-13700) 0082-mdcheck-Log-when-done.patch - Makefile: add EXTRAVERSION support (jsc#SLE-13700) 0083-Makefile-add-EXTRAVERSION-support.patch - uuid.c: split uuid stuffs from util.c (jsc#SLE-13700) OBS-URL: https://build.opensuse.org/request/show/841255 OBS-URL: https://build.opensuse.org/package/show/Base:System/mdadm?expand=0&rev=189
71 lines
2.7 KiB
Diff
71 lines
2.7 KiB
Diff
From e48aed3c81a75fa3f761fb5b84e5d16f2baee709 Mon Sep 17 00:00:00 2001
|
|
From: Artur Paszkiewicz <artur.paszkiewicz@intel.com>
|
|
Date: Tue, 17 Mar 2020 10:20:12 +0100
|
|
Subject: [PATCH 68/89] imsm: support the Array Creation Time field in metadata
|
|
Git-commit: e48aed3c81a75fa3f761fb5b84e5d16f2baee709
|
|
Patch-mainline: mdadm-4.1+
|
|
References: jsc#SLE-13700
|
|
|
|
Also present its value in --examine and --examine --export.
|
|
|
|
Signed-off-by: Artur Paszkiewicz <artur.paszkiewicz@intel.com>
|
|
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
|
|
Signed-off-by: Coly Li <colyli@suse.de>
|
|
---
|
|
super-intel.c | 11 +++++++++--
|
|
1 file changed, 9 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/super-intel.c b/super-intel.c
|
|
index 6680df2..8840fff 100644
|
|
--- a/super-intel.c
|
|
+++ b/super-intel.c
|
|
@@ -260,8 +260,9 @@ struct imsm_super {
|
|
* (starts at 1)
|
|
*/
|
|
__u16 filler1; /* 0x4E - 0x4F */
|
|
-#define IMSM_FILLERS 34
|
|
- __u32 filler[IMSM_FILLERS]; /* 0x50 - 0xD7 RAID_MPB_FILLERS */
|
|
+ __u64 creation_time; /* 0x50 - 0x57 Array creation time */
|
|
+#define IMSM_FILLERS 32
|
|
+ __u32 filler[IMSM_FILLERS]; /* 0x58 - 0xD7 RAID_MPB_FILLERS */
|
|
struct imsm_disk disk[1]; /* 0xD8 diskTbl[numDisks] */
|
|
/* here comes imsm_dev[num_raid_devs] */
|
|
/* here comes BBM logs */
|
|
@@ -2014,6 +2015,7 @@ static void examine_super_imsm(struct supertype *st, char *homehost)
|
|
__u32 sum;
|
|
__u32 reserved = imsm_reserved_sectors(super, super->disks);
|
|
struct dl *dl;
|
|
+ time_t creation_time;
|
|
|
|
strncpy(str, (char *)mpb->sig, MPB_SIG_LEN);
|
|
str[MPB_SIG_LEN-1] = '\0';
|
|
@@ -2022,6 +2024,9 @@ static void examine_super_imsm(struct supertype *st, char *homehost)
|
|
printf(" Orig Family : %08x\n", __le32_to_cpu(mpb->orig_family_num));
|
|
printf(" Family : %08x\n", __le32_to_cpu(mpb->family_num));
|
|
printf(" Generation : %08x\n", __le32_to_cpu(mpb->generation_num));
|
|
+ creation_time = __le64_to_cpu(mpb->creation_time);
|
|
+ printf(" Creation Time : %.24s\n",
|
|
+ creation_time ? ctime(&creation_time) : "Unknown");
|
|
printf(" Attributes : ");
|
|
if (imsm_check_attributes(mpb->attributes))
|
|
printf("All supported\n");
|
|
@@ -2126,6 +2131,7 @@ static void export_examine_super_imsm(struct supertype *st)
|
|
printf("MD_LEVEL=container\n");
|
|
printf("MD_UUID=%s\n", nbuf+5);
|
|
printf("MD_DEVICES=%u\n", mpb->num_disks);
|
|
+ printf("MD_CREATION_TIME=%llu\n", __le64_to_cpu(mpb->creation_time));
|
|
}
|
|
|
|
static void detail_super_imsm(struct supertype *st, char *homehost,
|
|
@@ -5762,6 +5768,7 @@ static int add_to_super_imsm_volume(struct supertype *st, mdu_disk_info_t *dk,
|
|
sum += __gen_imsm_checksum(mpb);
|
|
mpb->family_num = __cpu_to_le32(sum);
|
|
mpb->orig_family_num = mpb->family_num;
|
|
+ mpb->creation_time = __cpu_to_le64((__u64)time(NULL));
|
|
}
|
|
super->current_disk = dl;
|
|
return 0;
|
|
--
|
|
2.26.2
|
|
|