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 e1b8543d3ff214f9f363294daaed774388a7cee4..1226b2cb9b33ea10c8814ecd2ee9f0c02d051808 100644 (file)
--- 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 b41eeb20221d5b37db898a72f80cb1ef23431bcb..43a7bb69f0bdd98f1da70193a473533f5061fac4 100644 (file)
--- 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;
 }