From nobody Tue Feb 10 02:49:50 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1621373980; cv=none; d=zohomail.com; s=zohoarc; b=mXfuPHmJtPLxfWLRWiHu/5mwGwInwpNwf82SMTIamIp4RSbNBhJWQSO96dQa4wZhNikV5f0nNifQEEo5pq7K8/PfVmgbmnb2j1IOkq95SSnOjllbW9O1esknDvkBdRQbb1Td9lCve/OMSkPqdtbfuFh6QH3aDHrxGoFrv731GVQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621373980; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=CXaWsSp3fcTJyBQkg69rL3L7w9meW01k9sgY/cTMKM4=; b=oCuhfnCIh88QJliTpJX+LsA5/zXaTdDNKAMTen3U5rwPn8Y8HuMuourGIDDZYd9VN7h7h4DfDZCk3aEk+BCGaMlruQ8tEHnfNTeo65atecoFrZblpzA+Ub1WtQR03CcAQiKlQgoBpwoVMhV60cHB4g2TlWQgowNqBEX5L+P4I88= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 162137398091166.04484316862329; Tue, 18 May 2021 14:39:40 -0700 (PDT) Received: from localhost ([::1]:42468 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lj7RD-0006TP-TB for importer@patchew.org; Tue, 18 May 2021 17:39:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60896) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lj7Nh-0007CH-L2 for qemu-devel@nongnu.org; Tue, 18 May 2021 17:36:01 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:24099) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lj7Nb-0007Of-AW for qemu-devel@nongnu.org; Tue, 18 May 2021 17:36:01 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-545-AD9UqbBVMVKwDc0pAHSR1w-1; Tue, 18 May 2021 17:35:51 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C88EE107ACE3 for ; Tue, 18 May 2021 21:35:50 +0000 (UTC) Received: from horse.redhat.com (ovpn-114-77.rdu2.redhat.com [10.10.114.77]) by smtp.corp.redhat.com (Postfix) with ESMTP id A786110074E0; Tue, 18 May 2021 21:35:50 +0000 (UTC) Received: by horse.redhat.com (Postfix, from userid 10451) id 7BFFA225FD3; Tue, 18 May 2021 17:35:46 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621373753; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CXaWsSp3fcTJyBQkg69rL3L7w9meW01k9sgY/cTMKM4=; b=fuUePIyiKigsfkCt85kN1oWJdYgt989TWCWdGVngXjn5Z3oQKL6JwUASQATT2o5PR040cA ftyDxT3JAMgPpYi+QBJc9lMU0BKLpx6qksejLicVmJ6UywmPagzlmsLzXp9DeH/bdr7sRz VSX1sZQHilyWzpIPhY4e4AUBD38xt48= X-MC-Unique: AD9UqbBVMVKwDc0pAHSR1w-1 From: Vivek Goyal To: qemu-devel@nongnu.org, virtio-fs@redhat.com Subject: [PATCH v2 7/7] virtiofsd: Set req->reply_sent right after sending reply Date: Tue, 18 May 2021 17:35:38 -0400 Message-Id: <20210518213538.693422-8-vgoyal@redhat.com> In-Reply-To: <20210518213538.693422-1-vgoyal@redhat.com> References: <20210518213538.693422-1-vgoyal@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=vgoyal@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=vgoyal@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.374, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: ckuehl@redhat.com, dgilbert@redhat.com, vgoyal@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" There is no reason to set it in label "err". We should be able to set it right after sending reply. It is easier to read. Also got rid of label "err" because now only thing it was doing was return a code. We can return from the error location itself and no need to first jump to label "err". Reviewed-by: Dr. David Alan Gilbert Reviewed-by: Connor Kuehl Signed-off-by: Vivek Goyal --- tools/virtiofsd/fuse_virtio.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/tools/virtiofsd/fuse_virtio.c b/tools/virtiofsd/fuse_virtio.c index 99f91c9d87..fa4aff9b0e 100644 --- a/tools/virtiofsd/fuse_virtio.c +++ b/tools/virtiofsd/fuse_virtio.c @@ -366,14 +366,12 @@ int virtio_send_data_iov(struct fuse_session *se, str= uct fuse_chan *ch, if (in_len < sizeof(struct fuse_out_header)) { fuse_log(FUSE_LOG_ERR, "%s: elem %d too short for out_header\n", __func__, elem->index); - ret =3D E2BIG; - goto err; + return E2BIG; } if (in_len < tosend_len) { fuse_log(FUSE_LOG_ERR, "%s: elem %d too small for data len %zd\n", __func__, elem->index, tosend_len); - ret =3D E2BIG; - goto err; + return E2BIG; } =20 /* TODO: Limit to 'len' */ @@ -408,7 +406,7 @@ int virtio_send_data_iov(struct fuse_session *se, struc= t fuse_chan *ch, } fuse_log(FUSE_LOG_DEBUG, "%s: preadv failed (%m) len=3D%zd\n", __func__, len); - goto err; + return ret; } =20 if (!ret) { @@ -438,21 +436,14 @@ int virtio_send_data_iov(struct fuse_session *se, str= uct fuse_chan *ch, out_sg->len =3D tosend_len; } =20 - ret =3D 0; - vu_dispatch_rdlock(qi->virtio_dev); pthread_mutex_lock(&qi->vq_lock); vu_queue_push(dev, q, elem, tosend_len); vu_queue_notify(dev, q); pthread_mutex_unlock(&qi->vq_lock); vu_dispatch_unlock(qi->virtio_dev); - -err: - if (ret =3D=3D 0) { - req->reply_sent =3D true; - } - - return ret; + req->reply_sent =3D true; + return 0; } =20 static __thread bool clone_fs_called; --=20 2.25.4