Date: Sat, 31 Dec 2011 04:05:13 +0000 (UTC) From: Rick Macklem <rmacklem@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r229066 - in projects/nfsv4.1-client/sys/fs: nfs nfsclient Message-ID: <201112310405.pBV45DLZ045599@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rmacklem Date: Sat Dec 31 04:05:13 2011 New Revision: 229066 URL: http://svn.freebsd.org/changeset/base/229066 Log: Add an argument to nfsrpc_exchangeid() to specify the exchange flags to be used. Modified: projects/nfsv4.1-client/sys/fs/nfs/nfs_var.h projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clrpcops.c Modified: projects/nfsv4.1-client/sys/fs/nfs/nfs_var.h ============================================================================== --- projects/nfsv4.1-client/sys/fs/nfs/nfs_var.h Sat Dec 31 03:02:59 2011 (r229065) +++ projects/nfsv4.1-client/sys/fs/nfs/nfs_var.h Sat Dec 31 04:05:13 2011 (r229066) @@ -433,7 +433,7 @@ int nfsrpc_delegreturn(struct nfscldeleg int nfsrpc_getacl(vnode_t, struct ucred *, NFSPROC_T *, NFSACL_T *, void *); int nfsrpc_setacl(vnode_t, struct ucred *, NFSPROC_T *, NFSACL_T *, void *); int nfsrpc_exchangeid(struct nfsmount *, struct nfsclclient *, - struct ucred *, NFSPROC_T *); + uint32_t, struct ucred *, NFSPROC_T *); int nfsrpc_createsession(struct nfsmount *, struct nfsclclient *, struct ucred *, NFSPROC_T *); int nfsrpc_destroysession(struct nfsmount *, struct nfsclclient *, Modified: projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clrpcops.c ============================================================================== --- projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clrpcops.c Sat Dec 31 03:02:59 2011 (r229065) +++ projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clrpcops.c Sat Dec 31 04:05:13 2011 (r229066) @@ -774,7 +774,8 @@ nfsrpc_setclient(struct nfsmount *nmp, s if (nfsboottime.tv_sec == 0) NFSSETBOOTTIME(nfsboottime); if (NFSHASNFSV4N(nmp)) { - error = nfsrpc_exchangeid(nmp, clp, cred, p); + error = nfsrpc_exchangeid(nmp, clp, NFSV4EXCH_USEPNFSMDS | + NFSV4EXCH_USENONPNFS, cred, p); if (error) printf("exch=%d\n",error); if (error == 0) error = nfsrpc_createsession(nmp, clp, cred, p); @@ -4258,7 +4259,7 @@ nfsrpc_setaclrpc(vnode_t vp, struct ucre */ int nfsrpc_exchangeid(struct nfsmount *nmp, struct nfsclclient *clp, - struct ucred *cred, NFSPROC_T *p) + uint32_t exchflags, struct ucred *cred, NFSPROC_T *p) { uint32_t *tl, v41flags; struct nfsrv_descript nfsd; @@ -4274,7 +4275,7 @@ nfsrpc_exchangeid(struct nfsmount *nmp, (void) nfsm_strtom(nd, clp->nfsc_id, clp->nfsc_idlen); NFSM_BUILD(tl, u_int32_t *, 3 * NFSX_UNSIGNED); - *tl++ = txdr_unsigned(NFSV4EXCH_USENONPNFS); + *tl++ = txdr_unsigned(exchflags); *tl++ = txdr_unsigned(NFSV4EXCH_SP4NONE); /* Set the implementation id4 */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201112310405.pBV45DLZ045599>