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

This commit is contained in:
Brian Behlendorf 2009-01-09 14:07:25 -08:00
commit 5c2cb6b1e9
1 changed files with 2 additions and 0 deletions

View File

@ -61,6 +61,7 @@
#include <sys/dmu_objset.h> #include <sys/dmu_objset.h>
#include <sys/spa_boot.h> #include <sys/spa_boot.h>
#ifdef HAVE_ZPL
int zfsfstype; int zfsfstype;
vfsops_t *zfs_vfsops = NULL; vfsops_t *zfs_vfsops = NULL;
static major_t zfs_major; static major_t zfs_major;
@ -1517,6 +1518,7 @@ zfs_vfsinit(int fstype, char *name)
return (0); return (0);
} }
#endif /* HAVE_ZPL */
void void
zfs_init(void) zfs_init(void)