X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=module%2Fzfs%2Fzfs_ioctl.c;h=edfda7656adbc6ea1e6adb17409d8b72ab520f3c;hb=7a060636b05655cccd87ce74d70e5957bb234e5e;hp=994d65f7e2412e86740dc0298d2be3c56d9a7b43;hpb=3558fd73b5d863304102f6745c26e0b592aca60a;p=zfs.git diff --git a/module/zfs/zfs_ioctl.c b/module/zfs/zfs_ioctl.c index 994d65f..edfda76 100644 --- a/module/zfs/zfs_ioctl.c +++ b/module/zfs/zfs_ioctl.c @@ -3455,7 +3455,7 @@ zfs_check_clearable(char *dataset, nvlist_t *props, nvlist_t **errlist) VERIFY(nvlist_alloc(&errors, NV_UNIQUE_NAME, KM_SLEEP) == 0); - zc = kmem_alloc(sizeof (zfs_cmd_t), KM_SLEEP); + zc = kmem_alloc(sizeof (zfs_cmd_t), KM_SLEEP | KM_NODEBUG); (void) strcpy(zc->zc_name, dataset); pair = nvlist_next_nvpair(props, NULL); while (pair != NULL) { @@ -5178,8 +5178,10 @@ _init(void) mutex_init(&zfs_share_lock, NULL, MUTEX_DEFAULT, NULL); #endif /* HAVE_SHARE */ - printk(KERN_NOTICE "ZFS: Loaded ZFS Filesystem v%s%s\n", - ZFS_META_VERSION, ZFS_DEBUG_STR); + printk(KERN_NOTICE "ZFS: Loaded module v%s%s, " + "ZFS pool version %s, ZFS filesystem version %s\n", + ZFS_META_VERSION, ZFS_DEBUG_STR, + SPA_VERSION_STRING, ZPL_VERSION_STRING); return (0); @@ -5214,7 +5216,7 @@ _fini(void) tsd_destroy(&zfs_fsyncer_key); tsd_destroy(&rrw_tsd_key); - printk(KERN_NOTICE "ZFS: Unloaded ZFS Filesystem v%s%s\n", + printk(KERN_NOTICE "ZFS: Unloaded module v%s%s\n", ZFS_META_VERSION, ZFS_DEBUG_STR); return (0);