Date: Mon, 5 Mar 2012 03:31:40 +0000 (UTC) From: Rick Macklem <rmacklem@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r232532 - projects/nfsv4.1-client/sys/fs/nfsclient Message-ID: <201203050331.q253Ve9l064724@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rmacklem Date: Mon Mar 5 03:31:40 2012 New Revision: 232532 URL: http://svn.freebsd.org/changeset/base/232532 Log: Fix the NFSv4.1 client so that it still works for NFSv4.0. Modified: projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clrpcops.c Modified: projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clrpcops.c ============================================================================== --- projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clrpcops.c Mon Mar 5 02:40:18 2012 (r232531) +++ projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clrpcops.c Mon Mar 5 03:31:40 2012 (r232532) @@ -853,6 +853,18 @@ if (error) printf("aft reclcom=%d\n",err } return (error); } + + /* + * Allocate a single session structure for NFSv4.0, because some of + * the fields are used by NFSv4.0 although it doesn't do a session. + */ + dsp = malloc(sizeof(struct nfsclds), M_NFSCLDS, M_WAITOK | M_ZERO); + mtx_init(&dsp->nfsclds_mtx, "nfsds", NULL, MTX_DEF); + mtx_init(&dsp->nfsclds_sess.nfsess_mtx, "nfssession", NULL, MTX_DEF); + NFSLOCKMNT(nmp); + TAILQ_INSERT_HEAD(&nmp->nm_sess, dsp, nfsclds_list); + NFSUNLOCKMNT(nmp); + nfscl_reqstart(nd, NFSPROC_SETCLIENTID, nmp, NULL, 0, NULL, NULL); NFSM_BUILD(tl, u_int32_t *, 2 * NFSX_UNSIGNED); *tl++ = txdr_unsigned(nfsboottime.tv_sec); @@ -5237,7 +5249,9 @@ nfscl_doiods(vnode_t vp, struct uio *uio int eof, error; void *lckp; - /* First, get a reference cnt on the clientid for this mount. */ + if (!NFSHASPNFS(nmp)) + return (EIO); + /* Now, get a reference cnt on the clientid for this mount. */ if (nfscl_getref(nmp) == 0) return (EIO);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201203050331.q253Ve9l064724>