From nobody Fri Apr 19 19:11:08 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1502416754899212.52297078997015; Thu, 10 Aug 2017 18:59:14 -0700 (PDT) Received: from localhost ([::1]:45215 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dfzEG-0008FX-1W for importer@patchew.org; Thu, 10 Aug 2017 21:59:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52312) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dfzD9-0007kD-Tu for qemu-devel@nongnu.org; Thu, 10 Aug 2017 21:58:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dfzD9-0002OU-2I for qemu-devel@nongnu.org; Thu, 10 Aug 2017 21:58:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:8672) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dfzD4-0002MQ-F7; Thu, 10 Aug 2017 21:57:58 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C892770022; Fri, 11 Aug 2017 01:57:56 +0000 (UTC) Received: from red.redhat.com (ovpn-120-43.rdu2.redhat.com [10.10.120.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3392098145; Fri, 11 Aug 2017 01:57:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com C892770022 Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=eblake@redhat.com From: Eric Blake To: qemu-devel@nongnu.org Date: Thu, 10 Aug 2017 20:57:48 -0500 Message-Id: <20170811015749.20365-1-eblake@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Fri, 11 Aug 2017 01:57:57 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH] nbd: Fix trace message for disconnect X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , "open list:Network Block Dev..." Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" NBD_CMD_DISC is a disconnect request, not a data discard request. Signed-off-by: Eric Blake Reviewed-by: Stefan Hajnoczi --- Although this is not 2.10 material in isolation (it is only a bad trace message), I don't mind including it in a larger pull request; I'm still planning to fix the issue of a client hanging on a malicious server in time for -rc3 (whether via Vladimir's patch or a smaller one that I'm testing locally). nbd/common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nbd/common.c b/nbd/common.c index a2f28f2eec..e288d1b972 100644 --- a/nbd/common.c +++ b/nbd/common.c @@ -182,7 +182,7 @@ const char *nbd_cmd_lookup(uint16_t cmd) case NBD_CMD_WRITE: return "write"; case NBD_CMD_DISC: - return "discard"; + return "disconnect"; case NBD_CMD_FLUSH: return "flush"; case NBD_CMD_TRIM: --=20 2.13.4