summaryrefslogtreecommitdiffstats
path: root/module/zfs/zvol.c
diff options
context:
space:
mode:
authorshenyan1 <[email protected]>2013-06-29 19:07:45 +0800
committerBrian Behlendorf <[email protected]>2013-07-01 14:51:48 -0700
commit0a6bef26ec80ee4db5f5340bbc007a45311e0415 (patch)
tree9b7f6b6ec91c0a049a7cc3c661c8724ef56d7d1d /module/zfs/zvol.c
parentab68b6e5db29abcd20c0c7b12a8c2fa570031c8b (diff)
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 <[email protected]> Closes #1558
Diffstat (limited to 'module/zfs/zvol.c')
-rw-r--r--module/zfs/zvol.c4
1 files changed, 1 insertions, 3 deletions
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;
}