From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6A347C433DF for ; Mon, 12 Oct 2020 13:10:10 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id E76C322203 for ; Mon, 12 Oct 2020 13:10:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="jAGHmTf5" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E76C322203 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 2F19B940007; Mon, 12 Oct 2020 09:10:09 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2A209900002; Mon, 12 Oct 2020 09:10:09 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 190F8940007; Mon, 12 Oct 2020 09:10:09 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0225.hostedemail.com [216.40.44.225]) by kanga.kvack.org (Postfix) with ESMTP id D9F06900002 for ; Mon, 12 Oct 2020 09:10:08 -0400 (EDT) Received: from smtpin26.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 615D4180AD807 for ; Mon, 12 Oct 2020 13:10:08 +0000 (UTC) X-FDA: 77363306496.26.pull83_3708478271fa Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin26.hostedemail.com (Postfix) with ESMTP id 3AF751804B668 for ; Mon, 12 Oct 2020 13:10:08 +0000 (UTC) X-HE-Tag: pull83_3708478271fa X-Filterd-Recvd-Size: 4421 Received: from mail-io1-f68.google.com (mail-io1-f68.google.com [209.85.166.68]) by imf03.hostedemail.com (Postfix) with ESMTP for ; Mon, 12 Oct 2020 13:10:07 +0000 (UTC) Received: by mail-io1-f68.google.com with SMTP id n6so17574413ioc.12 for ; Mon, 12 Oct 2020 06:10:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=6XlKFYoGp/9Yp1zRFm8Sy327KOHtLJ5llMoPdKvcscA=; b=jAGHmTf5Nduq/fQUv+4nxjuTCU+LwWMr13IeDChxgwAclrtAvqi8ibY6kOF/HkeCAy LJ0Dtm0wZ5876fZRWreg6cYHCGlR3RjiSEIme4jwJt2JykPyxOmQAYETSMpdJMVE7s6J Dnw2y5HbsWr6nN3fpKAG3nzdiPtIo4eWlKF91vunAMAir8/dsVHdavzNYX3znB14XWdr JNAJnFXxXoDy3fXAI/pQeEMcSk5ozcgC5wiXd0136HcmPZNk4V483t43ETquo8uAQ8SB sLn/T521yuk7OPnqBI6DIHN4cnZFk/JwexylrdOYCsXwrVuaVLh2rI4XJ3TcakJtH3cu E7aA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=6XlKFYoGp/9Yp1zRFm8Sy327KOHtLJ5llMoPdKvcscA=; b=gvcCuPAlYsYqLP3apSjCSQnzz5fORsS4SO7AtjwpsppEOgr7maZqNgdl9QBAuTzbPU CBzlVKZtGhZILdFhFyLt21m2qTZDaqDfqLF20JvBPOKETbv2DUTip/FdAQh2OlDLqTBd 74DYnwHrtW20WMw7qSxlTUuFXiQjNK2PGzQSLmi1N6RphK86T7KaBq5WrqHd+rexH5Rx RgExYIPecaIerT7lhw1xbg4VT5dbMc1lGZ7HtBa0+mkeZxAEYbfvjN/ZgndIcIwshNRh rVOCIKGa1wZ4UphO2c3qhIX/uelEeZwLpajpOY0zR05czBQ+klCSBapoM0IUBgOSADLZ OTug== X-Gm-Message-State: AOAM530+oDjVLv+eg1ASHxX+SQiJlDvlKKasccJwrJe4EnZe1eXkkJhK PqvV5HPdIDCw/G4Nt51GD8Od6UhwBiGpZ+CdAWo= X-Google-Smtp-Source: ABdhPJyQX7B4TigMLUeL1CeyT+6EMpdx6Rpju+B9FjFdQ94a5CEIxfd6w/uYgD7lIAfCV9OVGN8pV8heZnZB3F9w6h8= X-Received: by 2002:a5d:8b4c:: with SMTP id c12mr16754244iot.167.1602508207125; Mon, 12 Oct 2020 06:10:07 -0700 (PDT) MIME-Version: 1.0 References: <20201012125323.17509-1-david@redhat.com> <20201012125323.17509-5-david@redhat.com> In-Reply-To: <20201012125323.17509-5-david@redhat.com> From: Pankaj Gupta Date: Mon, 12 Oct 2020 15:09:55 +0200 Message-ID: Subject: Re: [PATCH v1 04/29] virtio-mem: drop rc2 in virtio_mem_mb_plug_and_add() To: David Hildenbrand Cc: LKML , Linux MM , virtualization@lists.linux-foundation.org, Andrew Morton , "Michael S . Tsirkin" , Jason Wang Content-Type: text/plain; charset="UTF-8" X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: > Cc: "Michael S. Tsirkin" > Cc: Jason Wang > Cc: Pankaj Gupta > Signed-off-by: David Hildenbrand > --- > 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