Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

libzfs: import: zpool_clear_label: don't allocate another time for L2ARC header 

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Closes #13304
This commit is contained in:
наб 2022-04-07 04:37:16 +02:00 committed by Brian Behlendorf
parent a4e0cee178
commit 74e4bfbcff
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/libzfs/libzfs_import.c
View File

@ -137,7 +137,6 @@ zpool_clear_label(int fd)
struct stat64 statbuf; struct stat64 statbuf;
int l; int l;
vdev_label_t *label; vdev_label_t *label;
l2arc_dev_hdr_phys_t *l2dhdr = NULL;
uint64_t size; uint64_t size;
int labels_cleared = 0; int labels_cleared = 0;
boolean_t clear_l2arc_header = B_FALSE, header_cleared = B_FALSE; boolean_t clear_l2arc_header = B_FALSE, header_cleared = B_FALSE;
@ -150,11 +149,6 @@ zpool_clear_label(int fd)
if ((label = calloc(1, sizeof (vdev_label_t))) == NULL) if ((label = calloc(1, sizeof (vdev_label_t))) == NULL)
return (-1); return (-1);
if ((l2dhdr = calloc(1, sizeof (l2arc_dev_hdr_phys_t))) == NULL) {
free(label);
return (-1);
}
for (l = 0; l < VDEV_LABELS; l++) { for (l = 0; l < VDEV_LABELS; l++) {
uint64_t state, guid, l2cache; uint64_t state, guid, l2cache;
nvlist_t *config; nvlist_t *config;
@ -209,14 +203,16 @@ zpool_clear_label(int fd)
} }
} }
/* Clear the L2ARC header. */ if (clear_l2arc_header) {
if (clear_l2arc_header && _Static_assert(sizeof (*label) >= sizeof (l2arc_dev_hdr_phys_t),
pwrite64(fd, l2dhdr, sizeof (l2arc_dev_hdr_phys_t), "label < l2arc_dev_hdr_phys_t");
VDEV_LABEL_START_SIZE) == sizeof (l2arc_dev_hdr_phys_t)) memset(label, 0, sizeof (l2arc_dev_hdr_phys_t));
if (pwrite64(fd, label, sizeof (l2arc_dev_hdr_phys_t),
VDEV_LABEL_START_SIZE) == sizeof (l2arc_dev_hdr_phys_t))
header_cleared = B_TRUE; header_cleared = B_TRUE;
}
free(label); free(label);
free(l2dhdr);
if (labels_cleared == 0) if (labels_cleared == 0)
return (-1); return (-1);