git://git.camperquake.de
/
zfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kmem_zalloc(..., KM_SLEEP) will never fail
[zfs.git]
/
module
/
zfs
/
zvol.c
diff --git
a/module/zfs/zvol.c
b/module/zfs/zvol.c
index
b41eeb2
..
43a7bb6
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);
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)
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));
blk_cleanup_queue(zv->zv_queue);
out_kmem:
kmem_free(zv, sizeof (zvol_state_t));
-out:
+
return NULL;
}
return NULL;
}