d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify eli_dump() function and allow to dump metadata stored in backup file.

Browse Source 
MFC after:	3 days
This commit is contained in:
pjd 2011-10-25 07:37:02 +00:00
parent b6b8505c01
commit aa3a4f205d
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sbin/geom/class/eli/geom_eli.c
View File

@ -1528,9 +1528,9 @@ eli_clear(struct gctl_req *req)
static void
eli_dump(struct gctl_req *req)
{
struct g_eli_metadata md, tmpmd;
struct g_eli_metadata md;
const char *name;
int error, i, nargs;
int i, nargs;
nargs = gctl_get_int(req, "nargs");
if (nargs < 1) {
@ -1540,17 +1540,7 @@ eli_dump(struct gctl_req *req)
for (i = 0; i < nargs; i++) {
name = gctl_get_ascii(req, "arg%d", i);
error = g_metadata_read(name, (unsigned char *)&tmpmd,
sizeof(tmpmd), G_ELI_MAGIC);
if (error != 0) {
fprintf(stderr, "Cannot read metadata from %s: %s.\n",
name, strerror(error));
gctl_error(req, "Not fully done.");
continue;
}
if (eli_metadata_decode((unsigned char *)&tmpmd, &md) != 0) {
fprintf(stderr, "MD5 hash mismatch for %s, skipping.\n",
name);
if (eli_metadata_read(NULL, name, &md) == -1) {
gctl_error(req, "Not fully done.");
continue;
}