From 3a1f0dcde1357685c0fd5208969de23027310265 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Mon, 5 Jan 2009 16:53:23 -0800 Subject: [PATCH 1/2] Refresh prototype due to upstream changes --- module/zfs/include/sys/vdev_disk.h | 1 - module/zfs/vdev_disk.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/module/zfs/include/sys/vdev_disk.h b/module/zfs/include/sys/vdev_disk.h index 38abf2e419..3d5ec0eb89 100644 --- a/module/zfs/include/sys/vdev_disk.h +++ b/module/zfs/include/sys/vdev_disk.h @@ -18,7 +18,6 @@ typedef struct vdev_disk { } vdev_disk_t; extern int vdev_disk_physio(ldi_handle_t, caddr_t, size_t, uint64_t, int); -extern nvlist_t *vdev_disk_read_rootlabel(char *devpath); #endif diff --git a/module/zfs/vdev_disk.c b/module/zfs/vdev_disk.c index 19cef7339f..3e451525fa 100644 --- a/module/zfs/vdev_disk.c +++ b/module/zfs/vdev_disk.c @@ -639,7 +639,7 @@ vdev_disk_io_done(zio_t *zio) } nvlist_t * -vdev_disk_read_rootlabel(char *devpath) +vdev_disk_read_rootlabel(char *devpath, char *devid, nvlist_t **config) { return NULL; } From 90ff5268415f8a897e8da5c5963ab5f380be5abc Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Mon, 5 Jan 2009 16:55:15 -0800 Subject: [PATCH 2/2] Remove symbol exports no longer needed with the dsl scrub rewrite --- module/zfs/spa.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/module/zfs/spa.c b/module/zfs/spa.c index 8a288b25f1..0afe877a3b 100644 --- a/module/zfs/spa.c +++ b/module/zfs/spa.c @@ -4353,9 +4353,6 @@ EXPORT_SYMBOL(spa_l2cache_space_update); /* scrubbing */ EXPORT_SYMBOL(spa_scrub); -EXPORT_SYMBOL(spa_scrub_suspend); -EXPORT_SYMBOL(spa_scrub_resume); -EXPORT_SYMBOL(spa_scrub_restart); /* spa syncing */ EXPORT_SYMBOL(spa_sync); /* only for DMU use */