diff --git a/stand/libsa/zfs/devicename_stubs.c b/stand/libsa/zfs/devicename_stubs.c --- a/stand/libsa/zfs/devicename_stubs.c +++ b/stand/libsa/zfs/devicename_stubs.c @@ -30,13 +30,6 @@ #include #include "libzfs.h" -__attribute__((weak)) -int -zfs_parsedev(struct devdesc **dev, const char *devspec, const char **path) -{ - return (EINVAL); -} - __attribute__((weak)) char * zfs_fmtdev(struct devdesc *vdev) diff --git a/stand/libsa/zfs/libzfs.h b/stand/libsa/zfs/libzfs.h --- a/stand/libsa/zfs/libzfs.h +++ b/stand/libsa/zfs/libzfs.h @@ -48,8 +48,6 @@ uint64_t root_guid; }; -int zfs_parsedev(struct devdesc **dev, const char *devspec, - const char **path); char *zfs_fmtdev(struct devdesc *); int zfs_probe_dev(const char *devname, uint64_t *pool_guid); int zfs_list(const char *name); diff --git a/stand/libsa/zfs/zfs.c b/stand/libsa/zfs/zfs.c --- a/stand/libsa/zfs/zfs.c +++ b/stand/libsa/zfs/zfs.c @@ -66,6 +66,9 @@ static void zfs_checkpoints_initial(spa_t *spa, const char *name, const char *dsname); +static int zfs_parsedev(struct devdesc **idev, const char *devspec, + const char **path); + struct devsw zfs_dev; struct fs_ops zfs_fsops = { @@ -1629,7 +1632,7 @@ .dv_parsedev = zfs_parsedev, }; -int +static int zfs_parsedev(struct devdesc **idev, const char *devspec, const char **path) { static char rootname[ZFS_MAXNAMELEN];