Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch

This commit is contained in:
Brian Behlendorf 2009-01-05 16:59:38 -08:00
parent 8d67f2bfde 37fbec5b71
commit 15abf76870
3 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
module/zfs/include/sys/vdev_disk.h
View File

@ -18,7 +18,6 @@ typedef struct vdev_disk {
} vdev_disk_t; } vdev_disk_t;
extern int vdev_disk_physio(ldi_handle_t, caddr_t, size_t, uint64_t, int); 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 #endif

3
module/zfs/spa.c
View File

@ -4357,9 +4357,6 @@ EXPORT_SYMBOL(spa_l2cache_space_update);
/* scrubbing */ /* scrubbing */
EXPORT_SYMBOL(spa_scrub); EXPORT_SYMBOL(spa_scrub);
EXPORT_SYMBOL(spa_scrub_suspend);
EXPORT_SYMBOL(spa_scrub_resume);
EXPORT_SYMBOL(spa_scrub_restart);
/* spa syncing */ /* spa syncing */
EXPORT_SYMBOL(spa_sync); /* only for DMU use */ EXPORT_SYMBOL(spa_sync); /* only for DMU use */

2
module/zfs/vdev_disk.c
View File

@ -639,7 +639,7 @@ vdev_disk_io_done(zio_t *zio)
} }
nvlist_t * nvlist_t *
vdev_disk_read_rootlabel(char *devpath) vdev_disk_read_rootlabel(char *devpath, char *devid, nvlist_t **config)
{ {
return NULL; return NULL;
} }