|
@@ -220,20 +220,20 @@ static long vhost_test_reset_owner(struct vhost_test *n)
|
|
|
{
|
|
|
void *priv = NULL;
|
|
|
long err;
|
|
|
- struct vhost_memory *memory;
|
|
|
+ struct vhost_umem *umem;
|
|
|
|
|
|
mutex_lock(&n->dev.mutex);
|
|
|
err = vhost_dev_check_owner(&n->dev);
|
|
|
if (err)
|
|
|
goto done;
|
|
|
- memory = vhost_dev_reset_owner_prepare();
|
|
|
- if (!memory) {
|
|
|
+ umem = vhost_dev_reset_owner_prepare();
|
|
|
+ if (!umem) {
|
|
|
err = -ENOMEM;
|
|
|
goto done;
|
|
|
}
|
|
|
vhost_test_stop(n, &priv);
|
|
|
vhost_test_flush(n);
|
|
|
- vhost_dev_reset_owner(&n->dev, memory);
|
|
|
+ vhost_dev_reset_owner(&n->dev, umem);
|
|
|
done:
|
|
|
mutex_unlock(&n->dev.mutex);
|
|
|
return err;
|