Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch

2009-01-05 16:59:36 -08:00 · 2009-01-05 16:59:36 -08:00 · 37fbec5b71
parent 972e33ef17 3a1f0dcde1
commit 37fbec5b71
2 changed files with 1 additions and 2 deletions
--- 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

--- 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;
 }