From nobody Mon Jul 25 21:02:43 2022 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 4LsCDN1H4hz4Wmf9; Mon, 25 Jul 2022 21:02:44 +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 4LsCDN0kgxz3sG8; Mon, 25 Jul 2022 21:02:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658782964; 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=xi8B8lTyY16EaOuoRqQQ+NsJFv2NDvB4X3RFaDCHRWs=; b=keXvhILof4S4ZDG6lGvHXkZKuYL5Ycn2Wb2jEQGLeTQGT9mDjWFIgZUq2w0qRwdI9zxQ2s pqG1k58BhW8okQ7u+PAzNGTWkTkjqojlIaWLOuCmggT2vh9U4i0P7PeAiMyq31Wje03joD 9DHno5aD1oFltEbqGSIE3cYS/USi33oJUmSXJyf4loxhRIZdy3f9xMMf3FHZEFmqVCUcs+ HBcwC5QUYfkQH2/j8BBSV9bCCvNo5/l9D2sKz3ZZkHH+UqkCJCdvEMz0mCq7n/75G5+L+Q Duy2/hZbTtLU8fnWFf8bXOKwVsk+5iKoHI6cacpGRipi9My8s/UEZdqUSpIUDg== 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 4LsCDM6sMGz1BGf; Mon, 25 Jul 2022 21:02:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 26PL2hmH004055; Mon, 25 Jul 2022 21:02:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26PL2hLU004054; Mon, 25 Jul 2022 21:02:43 GMT (envelope-from git) Date: Mon, 25 Jul 2022 21:02:43 GMT Message-Id: <202207252102.26PL2hLU004054@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 516998709ade - stable/13 - nfscl: Change the cred argument to non-NULL for pNFS proxies 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 516998709ade4cf551660fa572ed7c5aa0a7fcff Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658782964; 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=xi8B8lTyY16EaOuoRqQQ+NsJFv2NDvB4X3RFaDCHRWs=; b=k5JMe/njB36Mt4tAzIuk1e+4MNDhKF26wuoxMOSHhkiZ46QWFPkFyfU/hJX5YYtEA5+vqM CVeYSC8yWvAB1ohx8GAfhrerj9lx/jB1iKvQCWy7abhV5/xoRUK15moXsIeVOpRrJJz53M 5r9VffWDLa+pwdYIiM8aymSFZpR9hXIscmQD1HSsJVah9G4Z1J9TfVCsAIUR/EzyF1xkNd 9QTzw/KE6SeM70QixwH4cFx/HwsmxN1AZf0ej5ArbPdyEMjFne16PvBs2o2Yp2XiXyJrYS CeJH7b1tG8ENpcmXNmtmHDN7VK2jZtOGnIXPCtMUZ+3qjTUxdcfcIXowSR7TUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658782964; a=rsa-sha256; cv=none; b=QlCblw967e/LkmvkCDkHljZxk+aRbwAiafiMWNRfxKoQ82WqEdT0CP2oyfA1J7WCj0Um0G DxJM1agFmQEZNSUPoXrYilGWJi7+6BDH/ISdp8h/SWgS/aJp9Oh7ycHhdOSUg8niwTWlUo mXxWPsS7DjjuGuYHyxjpVHHEyknsf+FzP0q1j8vWFOiuCI4iTqyc6j9pOWqo5fSOq6+XVu 2zp66dNdN5GR9T/52l3VaXAi9dG1GTirnQc7WIj8FqxpxqLzAVPMxjtDJWZGd/90M765lw qsvJQr6WB/eRUIbzY5Mta46oROKKlwwuj6sIyIj9OWEXo2HgFvGVLXha4JzZNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=516998709ade4cf551660fa572ed7c5aa0a7fcff commit 516998709ade4cf551660fa572ed7c5aa0a7fcff Author: Rick Macklem AuthorDate: 2022-07-09 00:27:23 +0000 Commit: Rick Macklem CommitDate: 2022-07-25 20:57:54 +0000 nfscl: Change the cred argument to non-NULL for pNFS proxies Commit 326bcf9394c7 added a "cred" argument to nfscl_reqstart(). For the pNFS proxy calls on the server, the argument should be "cred" instead of NULL. This patch fixes this. Since the argument is not yet used, this patch should not result in a semantics change. PR: 260011 (cherry picked from commit 2b766d5e5a73fce7120131d56bffc1715f71e7c9) --- sys/fs/nfsserver/nfs_nfsdport.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/fs/nfsserver/nfs_nfsdport.c b/sys/fs/nfsserver/nfs_nfsdport.c index be0e0a03fbde..d834c71041c8 100644 --- a/sys/fs/nfsserver/nfs_nfsdport.c +++ b/sys/fs/nfsserver/nfs_nfsdport.c @@ -5235,7 +5235,7 @@ nfsrv_readdsrpc(fhandle_t *fhp, off_t off, int len, struct ucred *cred, st.other[2] = 0x55555555; st.seqid = 0xffffffff; nfscl_reqstart(nd, NFSPROC_READDS, nmp, (u_int8_t *)fhp, sizeof(*fhp), - NULL, NULL, 0, 0, NULL); + NULL, NULL, 0, 0, cred); nfsm_stateidtom(nd, &st, NFSSTATEID_PUTSTATEID); NFSM_BUILD(tl, uint32_t *, NFSX_UNSIGNED * 3); txdr_hyper(off, tl); @@ -5343,7 +5343,7 @@ nfsrv_writedsdorpc(struct nfsmount *nmp, fhandle_t *fhp, off_t off, int len, nd = malloc(sizeof(*nd), M_TEMP, M_WAITOK | M_ZERO); nfscl_reqstart(nd, NFSPROC_WRITE, nmp, (u_int8_t *)fhp, - sizeof(fhandle_t), NULL, NULL, 0, 0, NULL); + sizeof(fhandle_t), NULL, NULL, 0, 0, cred); /* * Use a stateid where other is an alternating 01010 pattern and @@ -5565,7 +5565,7 @@ nfsrv_allocatedsdorpc(struct nfsmount *nmp, fhandle_t *fhp, off_t off, nd = malloc(sizeof(*nd), M_TEMP, M_WAITOK | M_ZERO); nfscl_reqstart(nd, NFSPROC_ALLOCATE, nmp, (u_int8_t *)fhp, - sizeof(fhandle_t), NULL, NULL, 0, 0, NULL); + sizeof(fhandle_t), NULL, NULL, 0, 0, cred); /* * Use a stateid where other is an alternating 01010 pattern and @@ -5719,7 +5719,7 @@ nfsrv_setattrdsdorpc(fhandle_t *fhp, struct ucred *cred, NFSPROC_T *p, st.other[2] = 0x55555555; st.seqid = 0xffffffff; nfscl_reqstart(nd, NFSPROC_SETATTR, nmp, (u_int8_t *)fhp, sizeof(*fhp), - NULL, NULL, 0, 0, NULL); + NULL, NULL, 0, 0, cred); nfsm_stateidtom(nd, &st, NFSSTATEID_PUTSTATEID); nfscl_fillsattr(nd, &nap->na_vattr, vp, NFSSATTR_FULL, 0); @@ -5904,7 +5904,7 @@ nfsrv_setacldsdorpc(fhandle_t *fhp, struct ucred *cred, NFSPROC_T *p, st.other[2] = 0x55555555; st.seqid = 0xffffffff; nfscl_reqstart(nd, NFSPROC_SETACL, nmp, (u_int8_t *)fhp, sizeof(*fhp), - NULL, NULL, 0, 0, NULL); + NULL, NULL, 0, 0, cred); nfsm_stateidtom(nd, &st, NFSSTATEID_PUTSTATEID); NFSZERO_ATTRBIT(&attrbits); NFSSETBIT_ATTRBIT(&attrbits, NFSATTRBIT_ACL); @@ -6039,7 +6039,7 @@ nfsrv_getattrdsrpc(fhandle_t *fhp, struct ucred *cred, NFSPROC_T *p, NFSD_DEBUG(4, "in nfsrv_getattrdsrpc\n"); nd = malloc(sizeof(*nd), M_TEMP, M_WAITOK | M_ZERO); nfscl_reqstart(nd, NFSPROC_GETATTR, nmp, (u_int8_t *)fhp, - sizeof(fhandle_t), NULL, NULL, 0, 0, NULL); + sizeof(fhandle_t), NULL, NULL, 0, 0, cred); NFSZERO_ATTRBIT(&attrbits); NFSSETBIT_ATTRBIT(&attrbits, NFSATTRBIT_SIZE); NFSSETBIT_ATTRBIT(&attrbits, NFSATTRBIT_CHANGE); @@ -6107,7 +6107,7 @@ nfsrv_seekdsrpc(fhandle_t *fhp, off_t *offp, int content, bool *eofp, st.seqid = 0xffffffff; nd = malloc(sizeof(*nd), M_TEMP, M_WAITOK | M_ZERO); nfscl_reqstart(nd, NFSPROC_SEEKDS, nmp, (u_int8_t *)fhp, - sizeof(fhandle_t), NULL, NULL, 0, 0, NULL); + sizeof(fhandle_t), NULL, NULL, 0, 0, cred); nfsm_stateidtom(nd, &st, NFSSTATEID_PUTSTATEID); NFSM_BUILD(tl, uint32_t *, NFSX_HYPER + NFSX_UNSIGNED); txdr_hyper(*offp, tl); tl += 2;