From nobody Wed Jun 3 19:06:32 2026 X-Original-To: dev-commits-src-main@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 4gVxy061qjz6gW7c for ; Wed, 03 Jun 2026 19:06:32 +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 4gVxy05DrQz4Hxn for ; Wed, 03 Jun 2026 19:06:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780513592; 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=ac1bNtZlns9cxfPxPA+iWiMeR8/xGU52+mAP69tgNWFNjg1IMt6WcDp/s5/wmKaxQl12go +lP1lK3P05qOHGV0+KKujgR4Y0TO78N0SGxTq9xy4F4aB+s6RqxG05fBvtEigKS9v4y6EG iMO24rVN8SLYEtn7WO+eT7Lfib9aoT7/QFdDc6oTAo6E7oki2JoGC8pIq0nb7jo6nBZms9 3DHT6q0K8DNZnIVxs0xy2G4hzMfno+IHbt4QFIcRFzI/WjpHGgjRffO6RMVguF63IZZinj da43ase3M+Y1M/hkG7ohFCDf0teDBw1FnwxtzThGJGcodw57PnwWm3Xv+e8gUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780513592; a=rsa-sha256; cv=none; b=jjMR+u9yVZxE8zg0DJbYGjsbtnACaf/+aj6CdqqmSJNn1dX15KhVmD9RJ5/wWCmz+ikYBo XZKnBgfOSijURmFKcOisqXFc+9QGRXgiv4PTyYRdeDbsquonCI6m3fWB4b25/p7ResTseG zmUYYjNz/mOAzI+fq3xHVMjQu5q3wy4jplT0e/bsBBmUkbRHituSdSVdXvOPFAA9TlwkOk qNvXShVch5oV29XMtaNhtDp8iwTs24UXXjqSGlNVoApfO+8Q6tX5/RCRNwLIkIa05OKRGk wJCcITnuMLLHG0XYq5v9aYnQMJFYYC8N7vqzOB3ycqP9Pu2k4HXNgQ17kk+Fpg== 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=1780513592; 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=lDbxEuR/5lg8++NLIIT7/RTldB+sWlcadTomRsbNfwN52cor6GFJIYlDUFbmZzOtOCmcbq 7oliE08fCTq6afo7HnbxH/1woggDOm12/gJAVqByYvQrT+8ZuqocHInTmwzao2maXpoisV FoX01imKfkegJsfkACWTxQkZZ77fqKI35mOuuIzFEVQDd6LgUP8xvVQTGT0+e3/b7BJHBZ eyal4j3LuvT1bf2z2kQRD/R030R3Q+M+XXdQFcGqVI3LDaXjkU2rrcax4ZRDVOJFT+LdRv Z3QQujxwXKiUUISDOglPa6megnJyxgOr8Jk5c9gaREDYG4drdbx7Yslj3Agkzw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gVxy04TZSz8lJ for ; Wed, 03 Jun 2026 19:06:32 +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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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);