From nobody Mon Feb 9 08:10:13 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=1620769310; cv=none; d=zohomail.com; s=zohoarc; b=ZHS+XX2NBIgID0H1EWMJ1T3/CrU+kVCLsTc6/jlsK95ra6jN+o7NWeow/uLHIxhkNTri1S3GWgjxTs1gv76ZB+7lD6J6U9oCOQoKu6phaRcxGXmAwy1JTTh3ZTQQWQQGUzeUQbNJRtXSYVf0OQ0TDvftQtN7+UwQyMPP/3Y5wOk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620769310; 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=ELxBNUvrnK70yQHi9ncYnnmAF8jZ25Va3X75XDKT1yE=; b=FJaCPfYtsEEXuboYJUp4cdWDuR26nBGcfqknHozHk8XSlYaahlZtk/14ARWvkO+mM2kDq+vuQ2UcnzBj1/J2EeA9ebFwvpG/tR/ftU34nE/ALCY4V/9I2qo4mmGMW1WKFRubuPhOhn7Oy9rUgTUiM66wpjjWWjnnWVcvdFTefO8= 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 162076931076863.973103426826015; Tue, 11 May 2021 14:41:50 -0700 (PDT) Received: from localhost ([::1]:57416 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lga8T-0006l2-Px for importer@patchew.org; Tue, 11 May 2021 17:41:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51072) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lga4f-0007MU-Q9 for qemu-devel@nongnu.org; Tue, 11 May 2021 17:37:53 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:59402) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lga4d-0005t8-Bp for qemu-devel@nongnu.org; Tue, 11 May 2021 17:37:53 -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-19-tJwkaXAcOQ6LEot6ZP0G7g-1; Tue, 11 May 2021 17:37:48 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 432E6106BAA9 for ; Tue, 11 May 2021 21:37:47 +0000 (UTC) Received: from horse.redhat.com (ovpn-115-221.rdu2.redhat.com [10.10.115.221]) by smtp.corp.redhat.com (Postfix) with ESMTP id C57305D9D7; Tue, 11 May 2021 21:37:43 +0000 (UTC) Received: by horse.redhat.com (Postfix, from userid 10451) id 4C642225FD0; Tue, 11 May 2021 17:37:43 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620769069; 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=ELxBNUvrnK70yQHi9ncYnnmAF8jZ25Va3X75XDKT1yE=; b=eFj3UbjRkwhmEjVvDkqawCHJ59cVnuadoAMMdVwleyzwdLpI9Rai8Q+5zvQE/VaBziRmLe NrmzSA+gYozS6l7rNYhAla2+yZbSzGCX+OsM6P622bExjJBbk8Mf2r6mMbWYuYfAy+3ihP WFvAB1eJzo4bsYljNuA7YtDVQiGaq0k= X-MC-Unique: tJwkaXAcOQ6LEot6ZP0G7g-1 From: Vivek Goyal To: qemu-devel@nongnu.org, virtio-fs@redhat.com Subject: [PATCH 4/7] virtiofsd: get rid of in_sg_left variable Date: Tue, 11 May 2021 17:37:33 -0400 Message-Id: <20210511213736.281016-5-vgoyal@redhat.com> In-Reply-To: <20210511213736.281016-1-vgoyal@redhat.com> References: <20210511213736.281016-1-vgoyal@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.699, 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: 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" in_sg_left seems to be being used primarly for debugging purpose. It is keeping track of how many bytes are left in the scatter list we are reading into. We already have another variable "len" which keeps track how many bytes are left to be read. And in_sg_left is greater than or equal to len. We have already ensured that in the beginning of function. 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; } So in_sg_left seems like a redundant variable. It probably was useful for debugging when code was being developed. Get rid of it. It helps simplify this function. Signed-off-by: Vivek Goyal Reviewed-by: Dr. David Alan Gilbert --- tools/virtiofsd/fuse_virtio.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/tools/virtiofsd/fuse_virtio.c b/tools/virtiofsd/fuse_virtio.c index d56b225800..ccad2b3f8a 100644 --- a/tools/virtiofsd/fuse_virtio.c +++ b/tools/virtiofsd/fuse_virtio.c @@ -394,20 +394,16 @@ int virtio_send_data_iov(struct fuse_session *se, str= uct fuse_chan *ch, /* skip over parts of in_sg that contained the header iov */ size_t skip_size =3D iov_len; =20 - size_t in_sg_left =3D 0; do { if (skip_size !=3D 0) { iov_discard_front(&in_sg_ptr, &in_sg_cpy_count, skip_size); } =20 - int i; - for (i =3D 0, in_sg_left =3D 0; i < in_sg_cpy_count; i++) { - in_sg_left +=3D in_sg_ptr[i].iov_len; - } fuse_log(FUSE_LOG_DEBUG, "%s: after skip skip_size=3D%zd in_sg_cpy_count=3D%d " - "in_sg_left=3D%zd\n", - __func__, skip_size, in_sg_cpy_count, in_sg_left); + "len remaining=3D%zd\n", __func__, skip_size, in_sg_cpy_c= ount, + len); + ret =3D preadv(buf->buf[0].fd, in_sg_ptr, in_sg_cpy_count, buf->buf[0].pos); =20 @@ -434,13 +430,12 @@ int virtio_send_data_iov(struct fuse_session *se, str= uct fuse_chan *ch, } if (!ret) { /* EOF case? */ - fuse_log(FUSE_LOG_DEBUG, "%s: !ret in_sg_left=3D%zd\n", __func= __, - in_sg_left); + fuse_log(FUSE_LOG_DEBUG, "%s: !ret len remaining=3D%zd\n", __f= unc__, + len); break; } - in_sg_left -=3D ret; len -=3D ret; - } while (in_sg_left); + } while (len); =20 /* Need to fix out->len on EOF */ if (len) { --=20 2.25.4