From nobody Sat Jun 15 13:03:34 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W1btb0n2Gz5NmWj; Sat, 15 Jun 2024 13:03:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W1btb0DJRz4BN9; Sat, 15 Jun 2024 13:03:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718456615; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j0MBCcQk1TWb7tR0K7i+RWKm1ocXqHqDrAGbnjtmOBk=; b=euhJjmDqA/Gsq1zgvdfSngurz+zZSjMhmxR9xC9rHh8oH0M6jwGSf8VazAE6yjOmNSxrdu OQa6AnW1PSXgAkIdzYb5I57QpYiJjQpJaLXJlkBf4qzGIMDGsUzHJaSc8sfK72zWPDINyN q/sI76j4ZFJOrp8EqrEdKEXimvcyeQWTLRroERw8424x3ZzAGvBIoLgQi4Q8ZZ+5A53cfo ExZ0r6YVtuR344haIYSRm2GVJMM0y/A66Fhb5d5lHEL9TznqSkPPVTl3ZT+IgjI/IOvlMv Zz0X5hjtDBV5FRiyqCGREq8OQlsx6wfzsOXZQRlkpbCktfOMznsy1Ih4i+j4LQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718456615; a=rsa-sha256; cv=none; b=MxPW8xBTCR6Ew2GV6m2I2MV1lw0ngMqAxyQyJtoRLER5Ik/xq4rxYx5scZl3bOSS5OcR6m 2mfbmM50ZNDR1LePoV6HDr+phtkMrDAYaR76rPUmgUgkt2f3ar+B5T0bn85Ds1PLFjKWVF agv0N4G49ID9SDges1VluoJiEOy665CndaT07gYeQPDHaj1KKwKbB5eTlfouwcF+aCwZzV Xyf1+HuF3OWv/q1WD11Buwlb61pw0u14zIg7vF/v1et5iwhQVJmEdVedXyiE4BTPE8jKTT 96N3ZQ7dYUjs7qsSMjdybPchTQ973gyymMvAdNOJrZ9Pfze45cwpuEEHbu5DYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718456615; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j0MBCcQk1TWb7tR0K7i+RWKm1ocXqHqDrAGbnjtmOBk=; b=w5LzM2I3+EV2Z5Aswd4lmqf1Sgs/ZlREXT6DED67aKb5lY0M7a7MA+KT0IAwYxuqdwOXFT +G29/rUvQxKDhChPZB/sEnUWJIuD9zA/RTSiuJCRVgkSzbIW7PMz3bWULrleAUjFx/azpJ z73MYIeJH9vVBwknCM4Dmx0V2RlM+4NmbXRgDbAS0tVsq2JMox7KXf4h6Zwaju1EDXnQkC KLKIwdV7tMiB71M1Iz77y0MFbEfX60SeHg9YAruzSmHViBkRJe50Z2IoakkRNoIZT5l/0/ q5i4Jqo86bgku3HvkXX8drv7np9XPi5bjpkIPnIz2AN6kjA0lWInR5vRes9alQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W1btZ6vFWz14v1; Sat, 15 Jun 2024 13:03:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45FD3YZN083691; Sat, 15 Jun 2024 13:03:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45FD3YBZ083688; Sat, 15 Jun 2024 13:03:34 GMT (envelope-from git) Date: Sat, 15 Jun 2024 13:03:34 GMT Message-Id: <202406151303.45FD3YBZ083688@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: 35e983028356 - stable/14 - md: round-trip the MUSTDEALLOC and RESERVE options List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 35e9830283561820a1fcb21b46b6f01e87700dec Auto-Submitted: auto-generated The branch stable/14 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=35e9830283561820a1fcb21b46b6f01e87700dec commit 35e9830283561820a1fcb21b46b6f01e87700dec Author: Alan Somers AuthorDate: 2024-06-01 18:00:03 +0000 Commit: Alan Somers CommitDate: 2024-06-15 13:03:23 +0000 md: round-trip the MUSTDEALLOC and RESERVE options If those options are requested when the device is created, ensure that they will be reported by MDIOCQUERY. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1270 (cherry picked from commit 9d449caddd4f442ba4ebfd2edafa1aef4fcba4c8) --- sys/dev/md/md.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/md/md.c b/sys/dev/md/md.c index a6f015962a24..1d531b88193f 100644 --- a/sys/dev/md/md.c +++ b/sys/dev/md/md.c @@ -1351,7 +1351,7 @@ mdcreate_malloc(struct md_s *sc, struct md_req *mdr) sc->fwsectors = mdr->md_fwsectors; if (mdr->md_fwheads != 0) sc->fwheads = mdr->md_fwheads; - sc->flags = mdr->md_options & (MD_COMPRESS | MD_FORCE); + sc->flags = mdr->md_options & (MD_COMPRESS | MD_FORCE | MD_RESERVE); sc->indir = dimension(sc->mediasize / sc->sectorsize); sc->uma = uma_zcreate(sc->name, sc->sectorsize, NULL, NULL, NULL, NULL, 0x1ff, 0); @@ -1476,7 +1476,7 @@ mdcreate_vnode(struct md_s *sc, struct md_req *mdr, struct thread *td) snprintf(sc->ident, sizeof(sc->ident), "MD-DEV%ju-INO%ju", (uintmax_t)vattr.va_fsid, (uintmax_t)vattr.va_fileid); sc->flags = mdr->md_options & (MD_ASYNC | MD_CACHE | MD_FORCE | - MD_VERIFY); + MD_VERIFY | MD_MUSTDEALLOC); if (!(flags & FWRITE)) sc->flags |= MD_READONLY; sc->vnode = nd.ni_vp;