From: shenyan1 <shenyanxxxy@qq.com>
Date: Sat, 29 Jun 2013 11:07:45 +0000 (+0800)
Subject: kmem_zalloc(..., KM_SLEEP) will never fail
X-Git-Tag: zfs-0.6.2~67
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0a6bef26ec80ee4db5f5340bbc007a45311e0415;p=zfs

kmem_zalloc(..., KM_SLEEP) will never fail

By definitition these allocations will never fail.  For
consistency with the rest of the code remove this dead error
handling code.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #1558
---

diff --git a/module/zfs/zfs_ioctl.c b/module/zfs/zfs_ioctl.c
index e1b8543d3..1226b2cb9 100644
--- a/module/zfs/zfs_ioctl.c
+++ b/module/zfs/zfs_ioctl.c
@@ -5136,8 +5136,6 @@ zfsdev_state_init(struct file *filp)
                 return (ENXIO);
 
 	zs = kmem_zalloc( sizeof(zfsdev_state_t), KM_SLEEP);
-	if (zs == NULL)
-		return (ENOMEM);
 
 	zs->zs_file = filp;
 	zs->zs_minor = minor;
diff --git a/module/zfs/zvol.c b/module/zfs/zvol.c
index b41eeb202..43a7bb69f 100644
--- a/module/zfs/zvol.c
+++ b/module/zfs/zvol.c
@@ -1214,8 +1214,6 @@ zvol_alloc(dev_t dev, const char *name)
 	int error = 0;
 
 	zv = kmem_zalloc(sizeof (zvol_state_t), KM_SLEEP);
-	if (zv == NULL)
-		goto out;
 
 	zv->zv_queue = blk_init_queue(zvol_request, &zv->zv_lock);
 	if (zv->zv_queue == NULL)
@@ -1267,7 +1265,7 @@ out_queue:
 	blk_cleanup_queue(zv->zv_queue);
 out_kmem:
 	kmem_free(zv, sizeof (zvol_state_t));
-out:
+
 	return NULL;
 }