Add missing include "opt_geom.h" to make GEOM_UZIP_DEBUG option working,
also rename enum member so it does not conflict with GEOM_UZIP option name. Submitted by: mizhka@gmail.com Differential Revision: https://reviews.freebsd.org/D6207
This commit is contained in:
parent
8c6a0d07a6
commit
e3d7ead7df
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=299195
@ -51,6 +51,8 @@ __FBSDID("$FreeBSD$");
|
|||||||
#include <geom/uzip/g_uzip_lzma.h>
|
#include <geom/uzip/g_uzip_lzma.h>
|
||||||
#include <geom/uzip/g_uzip_wrkthr.h>
|
#include <geom/uzip/g_uzip_wrkthr.h>
|
||||||
|
|
||||||
|
#include "opt_geom.h"
|
||||||
|
|
||||||
MALLOC_DEFINE(M_GEOM_UZIP, "geom_uzip", "GEOM UZIP data structures");
|
MALLOC_DEFINE(M_GEOM_UZIP, "geom_uzip", "GEOM UZIP data structures");
|
||||||
|
|
||||||
FEATURE(geom_uzip, "GEOM read-only compressed disks support");
|
FEATURE(geom_uzip, "GEOM read-only compressed disks support");
|
||||||
@ -576,8 +578,8 @@ g_uzip_taste(struct g_class *mp, struct g_provider *pp, int flags)
|
|||||||
struct g_provider *pp2;
|
struct g_provider *pp2;
|
||||||
struct g_uzip_softc *sc;
|
struct g_uzip_softc *sc;
|
||||||
enum {
|
enum {
|
||||||
GEOM_UZIP = 1,
|
G_UZIP = 1,
|
||||||
GEOM_ULZMA
|
G_ULZMA
|
||||||
} type;
|
} type;
|
||||||
|
|
||||||
g_trace(G_T_TOPOLOGY, "%s(%s,%s)", __func__, mp->name, pp->name);
|
g_trace(G_T_TOPOLOGY, "%s(%s,%s)", __func__, mp->name, pp->name);
|
||||||
@ -621,7 +623,7 @@ g_uzip_taste(struct g_class *mp, struct g_provider *pp, int flags)
|
|||||||
switch (header->magic[CLOOP_OFS_COMPR]) {
|
switch (header->magic[CLOOP_OFS_COMPR]) {
|
||||||
case CLOOP_COMP_LZMA:
|
case CLOOP_COMP_LZMA:
|
||||||
case CLOOP_COMP_LZMA_DDP:
|
case CLOOP_COMP_LZMA_DDP:
|
||||||
type = GEOM_ULZMA;
|
type = G_ULZMA;
|
||||||
if (header->magic[CLOOP_OFS_VERSN] < CLOOP_MINVER_LZMA) {
|
if (header->magic[CLOOP_OFS_VERSN] < CLOOP_MINVER_LZMA) {
|
||||||
DPRINTF(GUZ_DBG_ERR, ("%s: image version too old\n",
|
DPRINTF(GUZ_DBG_ERR, ("%s: image version too old\n",
|
||||||
gp->name));
|
gp->name));
|
||||||
@ -632,7 +634,7 @@ g_uzip_taste(struct g_class *mp, struct g_provider *pp, int flags)
|
|||||||
break;
|
break;
|
||||||
case CLOOP_COMP_LIBZ:
|
case CLOOP_COMP_LIBZ:
|
||||||
case CLOOP_COMP_LIBZ_DDP:
|
case CLOOP_COMP_LIBZ_DDP:
|
||||||
type = GEOM_UZIP;
|
type = G_UZIP;
|
||||||
if (header->magic[CLOOP_OFS_VERSN] < CLOOP_MINVER_ZLIB) {
|
if (header->magic[CLOOP_OFS_VERSN] < CLOOP_MINVER_ZLIB) {
|
||||||
DPRINTF(GUZ_DBG_ERR, ("%s: image version too old\n",
|
DPRINTF(GUZ_DBG_ERR, ("%s: image version too old\n",
|
||||||
gp->name));
|
gp->name));
|
||||||
@ -728,7 +730,7 @@ g_uzip_taste(struct g_class *mp, struct g_provider *pp, int flags)
|
|||||||
sc->req_total = 0;
|
sc->req_total = 0;
|
||||||
sc->req_cached = 0;
|
sc->req_cached = 0;
|
||||||
|
|
||||||
if (type == GEOM_UZIP) {
|
if (type == G_UZIP) {
|
||||||
sc->dcp = g_uzip_zlib_ctor(sc->blksz);
|
sc->dcp = g_uzip_zlib_ctor(sc->blksz);
|
||||||
} else {
|
} else {
|
||||||
sc->dcp = g_uzip_lzma_ctor(sc->blksz);
|
sc->dcp = g_uzip_lzma_ctor(sc->blksz);
|
||||||
|
Loading…
Reference in New Issue
Block a user