c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2025-01-13 03:30:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix undefined reference to `libzfs_fru_compare'

Browse Source 
Add trivial libzfs_fru_compare() function which can be used when
HAVE_LIBTOPO is not defined.  The only caller is find_vdev() and
this function should never be reached because search_fru must be
NULL unless HAVE_LIBTOPO is defined.

Rename _HAS_FMD_TOPO to existing HAVE_LIBTOPO which was
originally added for this purpose.  This macro will never be defined.

Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Reviewed-by: Giuseppe Di Natale <dinatale2@llnl.gov>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #5402
Closes #5909
This commit is contained in:
Brian Behlendorf 2017-03-23 18:24:09 -07:00 committed by GitHub
parent 55922e73b4
commit b25c5b0639
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/zed/agents/zfs_diagnosis.c
View File

@ -377,7 +377,7 @@ zfs_case_solve(fmd_hdl_t *hdl, zfs_case_t *zcp, const char *faultname,
nvlist_t *detector, *fault; nvlist_t *detector, *fault;
boolean_t serialize; boolean_t serialize;
nvlist_t *fru = NULL; nvlist_t *fru = NULL;
#ifdef _HAS_FMD_TOPO #ifdef HAVE_LIBTOPO
nvlist_t *fmri; nvlist_t *fmri;
topo_hdl_t *thp; topo_hdl_t *thp;
int err; int err;
@ -400,7 +400,7 @@ zfs_case_solve(fmd_hdl_t *hdl, zfs_case_t *zcp, const char *faultname,
zcp->zc_data.zc_vdev_guid); zcp->zc_data.zc_vdev_guid);
} }
#ifdef _HAS_FMD_TOPO #ifdef HAVE_LIBTOPO
/* /*
* We also want to make sure that the detector (pool or vdev) properly * We also want to make sure that the detector (pool or vdev) properly
* reflects the diagnosed state, when the fault corresponds to internal * reflects the diagnosed state, when the fault corresponds to internal

10
cmd/zed/agents/zfs_retire.c
View File

@ -177,7 +177,7 @@ find_by_guid(libzfs_handle_t *zhdl, uint64_t pool_guid, uint64_t vdev_guid,
return (zhp); return (zhp);
} }
#ifdef _HAS_FMD_TOPO #ifdef HAVE_LIBTOPO
static int static int
search_pool(zpool_handle_t *zhp, void *data) search_pool(zpool_handle_t *zhp, void *data)
{ {
@ -218,7 +218,7 @@ find_by_fru(libzfs_handle_t *zhdl, const char *fru, nvlist_t **vdevp)
*vdevp = cb.cb_vdev; *vdevp = cb.cb_vdev;
return (cb.cb_zhp); return (cb.cb_zhp);
} }
#endif /* _HAS_FMD_TOPO */ #endif /* HAVE_LIBTOPO */
/* /*
* Given a vdev, attempt to replace it with every known spare until one * Given a vdev, attempt to replace it with every known spare until one
@ -289,7 +289,7 @@ zfs_vdev_repair(fmd_hdl_t *hdl, nvlist_t *nvl)
zfs_retire_data_t *zdp = fmd_hdl_getspecific(hdl); zfs_retire_data_t *zdp = fmd_hdl_getspecific(hdl);
zfs_retire_repaired_t *zrp; zfs_retire_repaired_t *zrp;
uint64_t pool_guid, vdev_guid; uint64_t pool_guid, vdev_guid;
#ifdef _HAS_FMD_TOPO #ifdef HAVE_LIBTOPO
nvlist_t *asru; nvlist_t *asru;
#endif #endif
@ -315,7 +315,7 @@ zfs_vdev_repair(fmd_hdl_t *hdl, nvlist_t *nvl)
return; return;
} }
#ifdef _HAS_FMD_TOPO #ifdef HAVE_LIBTOPO
asru = fmd_nvl_alloc(hdl, FMD_SLEEP); asru = fmd_nvl_alloc(hdl, FMD_SLEEP);
(void) nvlist_add_uint8(asru, FM_VERSION, ZFS_SCHEME_VERSION0); (void) nvlist_add_uint8(asru, FM_VERSION, ZFS_SCHEME_VERSION0);
@ -477,7 +477,7 @@ zfs_retire_recv(fmd_hdl_t *hdl, fmd_event_t *ep, nvlist_t *nvl,
} }
if (is_disk) { if (is_disk) {
#ifdef _HAS_FMD_TOPO #ifdef HAVE_LIBTOPO
/* /*
* This is a disk fault. Lookup the FRU, convert it to * This is a disk fault. Lookup the FRU, convert it to
* an FMRI string, and attempt to find a matching vdev. * an FMRI string, and attempt to find a matching vdev.

9
lib/libzfs/libzfs_fru.c
View File

@ -455,6 +455,15 @@ libzfs_fru_clear(libzfs_handle_t *hdl, boolean_t final)
#else /* HAVE_LIBTOPO */ #else /* HAVE_LIBTOPO */
/*
* Compare to two FRUs, ignoring any authority information.
*/
boolean_t
libzfs_fru_compare(libzfs_handle_t *hdl, const char *a, const char *b)
{
return (B_FALSE);
}
/* /*
* Clear memory associated with the FRU hash. * Clear memory associated with the FRU hash.
*/ */