From: Lidong Zhong Date: Mon, 14 Dec 2020 14:51:33 +0000 (+0800) Subject: Dump: get stat from a wrong metadata file when restoring metadata X-Git-Tag: mdadm-4.2-rc1~25 X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fmdadm.git;a=commitdiff_plain;h=75562b57d43bd252399b55d0004b8eac4b337a67 Dump: get stat from a wrong metadata file when restoring metadata The dumped metadata files are shown as below localhost:~ # ll -ih test/ total 16K 34565564 -rw-r--r-- 2 root root 1.0G Dec 14 21:15 scsi-0QEMU_QEMU_HARDDISK_drive-scsi0-0-0-3 34565563 -rw-r--r-- 2 root root 1.0G Dec 14 21:15 scsi-0QEMU_QEMU_HARDDISK_drive-scsi0-0-0-4 34565563 -rw-r--r-- 2 root root 1.0G Dec 14 21:15 sda 34565564 -rw-r--r-- 2 root root 1.0G Dec 14 21:15 sdb It reports such error when trying to restore metadata for /dev/sda localhost:~ # mdadm --restore=test /dev/sda mdadm: test/scsi-0QEMU_QEMU_HARDDISK_drive-scsi0-0-0-4 is not the same size as /dev/sda - cannot restore. It's because the stb value has been changed to other metadata file in the while statement. Signed-off-by: Lidong Zhong Signed-off-by: Jes Sorensen --- diff --git a/Dump.c b/Dump.c index 38e8f238..736bcb60 100644 --- a/Dump.c +++ b/Dump.c @@ -272,6 +272,11 @@ int Restore_metadata(char *dev, char *dir, struct context *c, fname); goto err; } + if (stat(fname, &stb) != 0) { + pr_err("Could not stat %s for --restore.\n", + fname); + goto err; + } if (((unsigned long long)stb.st_size) != size) { pr_err("%s is not the same size as %s - cannot restore.\n", fname, dev);