Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
This commit is contained in:
commit
4f5a560334
|
@ -3235,7 +3235,7 @@ spa_vdev_remove_aux(nvlist_t *config, char *name, nvlist_t **dev, int count,
|
||||||
nvlist_t *dev_to_remove)
|
nvlist_t *dev_to_remove)
|
||||||
{
|
{
|
||||||
nvlist_t **newdev = NULL;
|
nvlist_t **newdev = NULL;
|
||||||
int i;
|
int i, j;
|
||||||
|
|
||||||
if (count > 1)
|
if (count > 1)
|
||||||
newdev = kmem_alloc((count - 1) * sizeof (void *), KM_SLEEP);
|
newdev = kmem_alloc((count - 1) * sizeof (void *), KM_SLEEP);
|
||||||
|
|
Loading…
Reference in New Issue