lkml.org 
[lkml]   [2020]   [Oct]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: [PATCH v1 04/29] virtio-mem: drop rc2 in virtio_mem_mb_plug_and_add()
> Cc: "Michael S. Tsirkin" <mst@redhat.com>
> Cc: Jason Wang <jasowang@redhat.com>
> Cc: Pankaj Gupta <pankaj.gupta.linux@gmail.com>
> Signed-off-by: David Hildenbrand <david@redhat.com>
> ---
> drivers/virtio/virtio_mem.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/virtio/virtio_mem.c b/drivers/virtio/virtio_mem.c
> index 78c2fbcddcf8..b3eebac7191f 100644
> --- a/drivers/virtio/virtio_mem.c
> +++ b/drivers/virtio/virtio_mem.c
> @@ -1072,7 +1072,7 @@ static int virtio_mem_mb_plug_and_add(struct virtio_mem *vm,
> uint64_t *nb_sb)
> {
> const int count = min_t(int, *nb_sb, vm->nb_sb_per_mb);
> - int rc, rc2;
> + int rc;
>
> if (WARN_ON_ONCE(!count))
> return -EINVAL;
> @@ -1103,13 +1103,12 @@ static int virtio_mem_mb_plug_and_add(struct virtio_mem *vm,
>
> dev_err(&vm->vdev->dev,
> "adding memory block %lu failed with %d\n", mb_id, rc);
> - rc2 = virtio_mem_mb_unplug_sb(vm, mb_id, 0, count);
>
> /*
> * TODO: Linux MM does not properly clean up yet in all cases
> * where adding of memory failed - especially on -ENOMEM.
> */
> - if (rc2)
> + if (virtio_mem_mb_unplug_sb(vm, mb_id, 0, count))
> new_state = VIRTIO_MEM_MB_STATE_PLUGGED;
> virtio_mem_mb_set_state(vm, mb_id, new_state);
> return rc;

Reviewed-by: Pankaj Gupta <pankaj.gupta.linux@gmail.com>

\
 
 \ /
  Last update: 2020-10-12 15:10    [W:0.323 / U:0.820 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site