From nobody Wed Jun 3 19:06:32 2026 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 4gVxy55HNdz6gVx3 for ; Wed, 03 Jun 2026 19:06:37 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gVxy54hHHz4J5X for ; Wed, 03 Jun 2026 19:06:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780513597; 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=hcfMrECe81dkhGaog/WwBJhUXOeompXB74OLymX3ts4=; b=DDsYKG9P56x/kdIo659DVitHBQtWWtxg3fyscW34hbPsSNNPeumsdl3Ddsmtywfe0JbnKR 9+R2gvDPRLZOLaPV4yCnyY2+5uaOqNV8UHVen3CYIbLIrnHblhgnsHr7dIwgOOXMgGs/j6 dm4rjVRlM5oh6w/8W2gAregKASYjo5evVlIDydggAPG34LOb/4eESK6jB3MyHFiZI/Jnm4 G7Fk6ZYswP3n6e8P7K+mGQV35998mzh44RFRFdXfHJAkxI2QHaaLAQpSkLRLBC9z/D/eyf GYLaDuIRLq9gYRrC5++BHJgGg7Dy0IGaQ4r3mw0yIT6Q4bE6Ydwwdc3pwpgKFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780513597; a=rsa-sha256; cv=none; b=gPU+7vKnhTbcOIM6iHftjEp6blqR0P17db0UY6D3xvac7ovvjQEgQ+5e4dSCeRV3vCMsoM FnsI4y0oIj+OkRYD8NAJ+6fuR6kJYd2/8STr5iv7FU5tEJRSJpzUPGM/atSr+dnlhiLZxw RZ5NPR4j+LAZ2T6uXMMZlALOP09Q5w+v2UeVRrHKXB8UN0rS/hXrtPy9vovUd1F0oDji+n tOFdpHxT3zUtVFMHtNqjXBcmfVu0hze4Vs7EmX71mexb41E74FYAR5Uu1LNiXFBjBF59Ta uZz+pxDctoJ7nN+eq3RBnJlbdoHvpqrkljmRY4KKzT4iw7brvmS3lObs6qgmTg== 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=1780513597; 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=hcfMrECe81dkhGaog/WwBJhUXOeompXB74OLymX3ts4=; b=WgcwAuWZCAJ89E2nWRQfymV/n2XjtezUi7Ywk9D+a+t62sGGvPGXPnc9AdmIlZK9mATn5D VZo43zY/X60rRTqMjhqsRMIOGk+XSB9JrdXFljz9xDZECvpBzxczM0TmI27wXqQaTs9Hv7 dXmCY8/S+nLTQGBFKbTbg8tda32ilekzZ/nNwN96DW9eaWzEgf6tM7EvAQ0H1ZUBefoXxJ ymMiguPVm8mu9B2WG9t1UCdp+r7WBEuyjDsE8w2F/e9+lW6m6Qvmj557qnY1rziW7kY2bq G7xQUpu2zK5ooEtCEe7jwdTbYzTV5/uQWecwUHPBFMxJtXZAMn2qaE2ViUE8FQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gVxy54Gfdz8nk for ; Wed, 03 Jun 2026 19:06:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26c11 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 03 Jun 2026 19:06:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 07d733963ecd - main - nfs_clrpcops.c: Change initial layout type to flex files 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 07d733963ecd1957999f5381b438b8c369686750 Auto-Submitted: auto-generated Date: Wed, 03 Jun 2026 19:06:32 +0000 Message-Id: <6a207b38.26c11.78270d4a@gitrepo.freebsd.org> The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=07d733963ecd1957999f5381b438b8c369686750 commit 07d733963ecd1957999f5381b438b8c369686750 Author: Rick Macklem AuthorDate: 2026-06-03 19:04:59 +0000 Commit: Rick Macklem CommitDate: 2026-06-03 19:04:59 +0000 nfs_clrpcops.c: Change initial layout type to flex files Since the File 4.1 layout is only supported by some large configurations of Netapp Filers, switch the client pNFS code to attempting to use Flexible File Format first. File 4.1 Layout should still work for any servers that do no support Flexible File Layout. --- sys/fs/nfsclient/nfs_clrpcops.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/fs/nfsclient/nfs_clrpcops.c b/sys/fs/nfsclient/nfs_clrpcops.c index 75713c875622..812bb5279e07 100644 --- a/sys/fs/nfsclient/nfs_clrpcops.c +++ b/sys/fs/nfsclient/nfs_clrpcops.c @@ -5541,7 +5541,7 @@ nfsrpc_exchangeid(struct nfsmount *nmp, struct nfsclclient *clp, NFSHASPNFSOPT(nmp)) { NFSCL_DEBUG(1, "set PNFS\n"); NFSLOCKMNT(nmp); - nmp->nm_state |= NFSSTA_PNFS; + nmp->nm_state |= NFSSTA_PNFS | NFSSTA_FLEXFILE; NFSUNLOCKMNT(nmp); dsp->nfsclds_flags |= NFSCLDS_MDS; } @@ -8910,10 +8910,10 @@ nfsrpc_layoutgetres(struct nfsmount *nmp, vnode_t vp, uint8_t *newfhp, if (laystat == NFSERR_UNKNLAYOUTTYPE) { NFSLOCKMNT(nmp); - if (!NFSHASFLEXFILE(nmp)) { - /* Switch to using Flex File Layout. */ - nmp->nm_state |= NFSSTA_FLEXFILE; - } else if (layouttype == NFSLAYOUT_FLEXFILE) { + if (NFSHASFLEXFILE(nmp)) { + /* Switch to using File 4.1 Layout. */ + nmp->nm_state &= ~NFSSTA_FLEXFILE; + } else if (layouttype == NFSLAYOUT_NFSV4_1_FILES) { /* Disable pNFS. */ NFSCL_DEBUG(1, "disable PNFS\n"); nmp->nm_state &= ~(NFSSTA_PNFS | NFSSTA_FLEXFILE);