loader should boot pre-feature flags pools.
ClosedPublic
Actions

Authored by tsoome on Oct 24 2016, 11:51 AM.

Details

Reviewers

avg
allanjude
imp

Commits

rS321680: MFC r307865 (by tsoome): loader should boot pre-feature flags pools.
rS307865: loader should boot pre-feature flags pools.

Summary

Missed corner case with feature flag test - the pre-feature-flags pool
will not have any features.

Test Plan

boot v28 pool.

Diff Detail

Repository

rS FreeBSD src repository - subversion

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

tsoome updated this revision to Diff 21646.Oct 24 2016, 11:51 AM

tsoome retitled this revision from to loader should boot pre-feature flags pools..

tsoome updated this object.

tsoome edited the test plan for this revision. (Show Details)

tsoome added reviewers: allanjude, imp.

Herald added a subscriber: delphij. · View Herald TranscriptOct 24 2016, 11:51 AM

forgot to return 0...

LGTM

This revision is now accepted and ready to land.Oct 24 2016, 12:07 PM

Approved for commit

Closed by commit rS307865: loader should boot pre-feature flags pools. (authored by tsoome). · Explain WhyOct 24 2016, 4:29 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Path

Size

head/

sys/

boot/

zfs/

zfsimpl.c

9 lines

Diff 21655

View Options

head/sys/boot/zfs/zfsimpl.c

Show First 20 Lines • Show All 121 Lines • ▼ Show 20 Lines	for (p = q; len--; ++p) {
*p = ' ';		*p = ' ';
else		else
*p = '\0';		*p = '\0';
}		}
}		}
}		}
q += namesize;		q += namesize;

if ((p = getenv("UNAME_m")))		if ((p = getenv("UNAME_p")))
		impUnsubmitted Done Inline Actions At the very least, this also needs to change to UNAME_p since that's what's being returned here. imp: At the very least, this also needs to change to UNAME_p since that's what's being returned here.
strlcpy(q, p, namesize);		strlcpy(q, p, namesize);
else {		else {
mib[0] = CTL_HW;		mib[0] = CTL_HW;
mib[1] = HW_MACHINE;		mib[1] = HW_MACHINE_ARCH;
len = namesize;		len = namesize;
oerrno = errno;		oerrno = errno;
if (sysctl(mib, 2, q, &len, NULL, 0) == -1) {		if (sysctl(mib, 2, q, &len, NULL, 0) == -1) {
if (errno == ENOMEM)		if (errno == ENOMEM)
errno = oerrno;		errno = oerrno;
else		else
rval = -1;		rval = -1;
}		}
q[namesize - 1] = '\0';		q[namesize - 1] = '\0';
}		}

return (rval);		return (rval);
}		}

loader should boot pre-feature flags pools.ClosedPublicActions