X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=module%2Fzfs%2Fzvol.c;h=a182f79d3f6f49659011edb13f0175662d9c68ca;hb=393b44c7112854fc11dc97885a87f666780cc9fe;hp=60ff64ebe7b03dfa41e96de42e611ecf02da7986;hpb=8630650a8d9cfba379a5b73bd95e903d577e0d8d;p=zfs.git

diff --git a/module/zfs/zvol.c b/module/zfs/zvol.c
index 60ff64e..a182f79 100644
--- a/module/zfs/zvol.c
+++ b/module/zfs/zvol.c
@@ -785,7 +785,7 @@ zvol_get_data(void *arg, lr_write_t *lr, char *buf, zio_t *zio)
 	ASSERT(zio != NULL);
 	ASSERT(size != 0);
 
-	zgd = (zgd_t *)kmem_zalloc(sizeof (zgd_t), KM_SLEEP);
+	zgd = (zgd_t *)kmem_zalloc(sizeof (zgd_t), KM_PUSHPAGE);
 	zgd->zgd_zilog = zv->zv_zilog;
 	zgd->zgd_rl = zfs_range_lock(&zv->zv_znode, offset, size, RL_READER);
 
@@ -1065,7 +1065,7 @@ zvol_probe(dev_t dev, int *part, void *arg)
 
 	mutex_enter(&zvol_state_lock);
 	zv = zvol_find_by_dev(dev);
-	kobj = zv ? get_disk(zv->zv_disk) : ERR_PTR(-ENOENT);
+	kobj = zv ? get_disk(zv->zv_disk) : NULL;
 	mutex_exit(&zvol_state_lock);
 
 	return kobj;