From nobody Sun Oct 5 21:15:26 2025 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=1588627386; cv=none; d=zohomail.com; s=zohoarc; b=UUi6K0/dH7mqM9N6d385HB2pkZEYZ3/fwbhBF4l+Ty/UXrmhYt53eyOt05zMk9gsF3w7OLWUPhKAqxWrolTHRW+P5IQ3R4o8w1HTvU17YiexoI+rBx4AI/Jq3D/eOE0PpnHDpX64qWr/Kn/4/8cBhl1Qg4QPRyVmuL1yP4jQRr0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588627386; 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=YyeVe7pGLDoxmKcIGHGJ1Xo7k60pAoX6pd3YEH7norA=; b=JX+bxiwBf0SZU+g5LquEsrUeHy73+mFic8VomGnEFMAP7mOfg55dpFq/z3H/4bdUX0B6EilyfRrAyuG+kPzWsWLjYqYd+wB9fmg2O3eHOQAlHxcrGZtH989Xt2APYbSBDeTgEIZkx9XrSrdxLjc7O39Hl+TqG/4QsgDaGLs61/A= 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 15886273868721.8752903929261038; Mon, 4 May 2020 14:23:06 -0700 (PDT) Received: from localhost ([::1]:41584 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jViYL-0002No-GF for importer@patchew.org; Mon, 04 May 2020 17:23:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46030) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jViQU-0003xT-Hg for qemu-devel@nongnu.org; Mon, 04 May 2020 17:14:58 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:35373 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jViQT-0000pK-QW for qemu-devel@nongnu.org; Mon, 04 May 2020 17:14:58 -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-6-kxpV4nuSPmmLXrV5_he0-Q-1; Mon, 04 May 2020 17:14:53 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 06980872FE0; Mon, 4 May 2020 21:14:52 +0000 (UTC) Received: from blue.redhat.com (ovpn-114-73.phx2.redhat.com [10.3.114.73]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8850170525; Mon, 4 May 2020 21:14:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588626897; 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=YyeVe7pGLDoxmKcIGHGJ1Xo7k60pAoX6pd3YEH7norA=; b=c+QytrQwm/iZNf2yieYGy3cJ0ovz4X73St+j9V/DhCUejyPcP8bHEthz0vp9ek/6X4mlUW eInvKoAdz0li4BcEE/OGBGmFeVpIqLosIMuaW5nbZgn3z5112yNL9zbHBXXMlnqQOdG2TS qnZsOfC/FUj7zURGSQpT+Pk0Du39xqg= X-MC-Unique: kxpV4nuSPmmLXrV5_he0-Q-1 From: Eric Blake To: qemu-devel@nongnu.org Subject: [PULL 4/4] block/nbd-client: drop max_block restriction from discard Date: Mon, 4 May 2020 16:14:38 -0500 Message-Id: <20200504211438.195926-5-eblake@redhat.com> In-Reply-To: <20200504211438.195926-1-eblake@redhat.com> References: <20200504211438.195926-1-eblake@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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=205.139.110.120; envelope-from=eblake@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/04 04:24:57 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN 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: Kevin Wolf , Vladimir Sementsov-Ogievskiy , "open list:Network Block Dev..." , Max Reitz 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" From: Vladimir Sementsov-Ogievskiy The NBD spec was updated (see nbd.git commit 9f30fedb) so that max_block doesn't relate to NBD_CMD_TRIM. So, drop the restriction. Signed-off-by: Vladimir Sementsov-Ogievskiy Message-Id: <20200401150112.9557-3-vsementsov@virtuozzo.com> Reviewed-by: Eric Blake [eblake: tweak commit message to call out NBD commit] Signed-off-by: Eric Blake --- block/nbd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/nbd.c b/block/nbd.c index d4d518a780c9..4ac23c8f6299 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -1955,7 +1955,7 @@ static void nbd_refresh_limits(BlockDriverState *bs, = Error **errp) } bs->bl.request_alignment =3D min; - bs->bl.max_pdiscard =3D max; + bs->bl.max_pdiscard =3D QEMU_ALIGN_DOWN(INT_MAX, min); bs->bl.max_pwrite_zeroes =3D max; bs->bl.max_transfer =3D max; --=20 2.26.2