From ccb17e335aed123268303ae81de1b71c1340a1e7 Mon Sep 17 00:00:00 2001 From: rwatson Date: Fri, 22 May 2009 12:35:12 +0000 Subject: Remove the unmaintained University of Michigan NFSv4 client from 8.x prior to 8.0-RELEASE. Rick Macklem's new and more feature-rich NFSv234 client and server are replacing it. Discussed with: rmacklem --- sys/nfsclient/bootp_subr.c | 2 -- sys/nfsclient/krpc_subr.c | 2 -- sys/nfsclient/nfs.h | 12 ------------ sys/nfsclient/nfs_bio.c | 21 +++++++-------------- sys/nfsclient/nfs_diskless.c | 1 - sys/nfsclient/nfs_krpc.c | 7 ------- sys/nfsclient/nfs_lock.c | 2 -- sys/nfsclient/nfs_nfsiod.c | 2 -- sys/nfsclient/nfs_node.c | 13 +++---------- sys/nfsclient/nfs_socket.c | 8 -------- sys/nfsclient/nfs_subs.c | 2 -- sys/nfsclient/nfs_vfsops.c | 1 - sys/nfsclient/nfs_vnops.c | 2 -- sys/nfsclient/nfsm_subs.h | 11 ----------- sys/nfsclient/nfsmount.h | 1 - sys/nfsclient/nfsnode.h | 7 ------- 16 files changed, 10 insertions(+), 84 deletions(-) (limited to 'sys/nfsclient') diff --git a/sys/nfsclient/bootp_subr.c b/sys/nfsclient/bootp_subr.c index f9bc5bf..05702f6 100644 --- a/sys/nfsclient/bootp_subr.c +++ b/sys/nfsclient/bootp_subr.c @@ -68,8 +68,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include - #include #include #include diff --git a/sys/nfsclient/krpc_subr.c b/sys/nfsclient/krpc_subr.c index 5682083..2023904 100644 --- a/sys/nfsclient/krpc_subr.c +++ b/sys/nfsclient/krpc_subr.c @@ -57,8 +57,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include - #include #include #include diff --git a/sys/nfsclient/nfs.h b/sys/nfsclient/nfs.h index 7f3a0f3..845f826 100644 --- a/sys/nfsclient/nfs.h +++ b/sys/nfsclient/nfs.h @@ -111,18 +111,6 @@ */ #define NFS_NFSSTATS 1 /* struct: struct nfsstats */ -/* - * File context information for nfsv4. Currently, there is only one - * lockowner for the whole machine "0." - */ -struct nfs4_fctx { - TAILQ_ENTRY(nfs4_fstate) next; - uint32_t refcnt; - struct nfs4_lowner *lop; - struct nfsnode *np; - char stateid[NFSX_V4STATEID]; -}; - #ifdef _KERNEL #ifdef MALLOC_DECLARE diff --git a/sys/nfsclient/nfs_bio.c b/sys/nfsclient/nfs_bio.c index 6c468fb..92be17c 100644 --- a/sys/nfsclient/nfs_bio.c +++ b/sys/nfsclient/nfs_bio.c @@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -56,8 +57,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include - #include #include #include @@ -65,8 +64,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include - static struct buf *nfs_getcacheblk(struct vnode *vp, daddr_t bn, int size, struct thread *td); static int nfs_directio_write(struct vnode *vp, struct uio *uiop, @@ -1612,17 +1609,13 @@ nfs_doio(struct vnode *vp, struct buf *bp, struct ucred *cr, struct thread *td) case VDIR: nfsstats.readdir_bios++; uiop->uio_offset = ((u_quad_t)bp->b_lblkno) * NFS_DIRBLKSIZ; - if ((nmp->nm_flag & NFSMNT_NFSV4) != 0) - error = nfs4_readdirrpc(vp, uiop, cr); - else { - if ((nmp->nm_flag & NFSMNT_RDIRPLUS) != 0) { - error = nfs_readdirplusrpc(vp, uiop, cr); - if (error == NFSERR_NOTSUPP) - nmp->nm_flag &= ~NFSMNT_RDIRPLUS; - } - if ((nmp->nm_flag & NFSMNT_RDIRPLUS) == 0) - error = nfs_readdirrpc(vp, uiop, cr); + if ((nmp->nm_flag & NFSMNT_RDIRPLUS) != 0) { + error = nfs_readdirplusrpc(vp, uiop, cr); + if (error == NFSERR_NOTSUPP) + nmp->nm_flag &= ~NFSMNT_RDIRPLUS; } + if ((nmp->nm_flag & NFSMNT_RDIRPLUS) == 0) + error = nfs_readdirrpc(vp, uiop, cr); /* * end-of-directory sets B_INVAL but does not generate an * error. diff --git a/sys/nfsclient/nfs_diskless.c b/sys/nfsclient/nfs_diskless.c index d6d6b21..26a27b9 100644 --- a/sys/nfsclient/nfs_diskless.c +++ b/sys/nfsclient/nfs_diskless.c @@ -55,7 +55,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include #include #include diff --git a/sys/nfsclient/nfs_krpc.c b/sys/nfsclient/nfs_krpc.c index 7f5c624..1aa398e 100644 --- a/sys/nfsclient/nfs_krpc.c +++ b/sys/nfsclient/nfs_krpc.c @@ -60,7 +60,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include #include @@ -70,8 +69,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include - #ifndef NFS_LEGACYRPC #ifdef KDTRACE_HOOKS @@ -445,8 +442,6 @@ nfs_request(struct vnode *vp, struct mbuf *mreq, int procnum, return (ESTALE); } nmp = VFSTONFS(vp->v_mount); - if ((nmp->nm_flag & NFSMNT_NFSV4) != 0) - return nfs4_request(vp, mreq, procnum, td, cred, mrp, mdp, dposp); bzero(&nf, sizeof(struct nfs_feedback_arg)); nf.nf_mount = nmp; nf.nf_td = td; @@ -740,8 +735,6 @@ nfs_sigintr(struct nfsmount *nmp, struct nfsreq *rep, struct thread *td) struct proc *p; sigset_t tmpset; - if ((nmp->nm_flag & NFSMNT_NFSV4) != 0) - return nfs4_sigintr(nmp, rep, td); /* Terminate all requests while attempting a forced unmount. */ if (nmp->nm_mountp->mnt_kern_flag & MNTK_UNMOUNTF) return (EIO); diff --git a/sys/nfsclient/nfs_lock.c b/sys/nfsclient/nfs_lock.c index 19ad066..ea6649e 100644 --- a/sys/nfsclient/nfs_lock.c +++ b/sys/nfsclient/nfs_lock.c @@ -53,8 +53,6 @@ __FBSDID("$FreeBSD$"); #include -#include - #include #include #include diff --git a/sys/nfsclient/nfs_nfsiod.c b/sys/nfsclient/nfs_nfsiod.c index 9e0e272..7dc3f19 100644 --- a/sys/nfsclient/nfs_nfsiod.c +++ b/sys/nfsclient/nfs_nfsiod.c @@ -63,8 +63,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include - #include #include #include diff --git a/sys/nfsclient/nfs_node.c b/sys/nfsclient/nfs_node.c index 517c3a9..a7f00ca 100644 --- a/sys/nfsclient/nfs_node.c +++ b/sys/nfsclient/nfs_node.c @@ -40,6 +40,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -49,8 +50,6 @@ __FBSDID("$FreeBSD$"); #include -#include - #include #include #include @@ -133,19 +132,13 @@ nfs_nget(struct mount *mntp, nfsfh_t *fhp, int fhsize, struct nfsnode **npp, int */ np = uma_zalloc(nfsnode_zone, M_WAITOK | M_ZERO); - if (nmp->nm_flag & NFSMNT_NFSV4) - error = getnewvnode("nfs4", mntp, &nfs4_vnodeops, &nvp); - else - error = getnewvnode("nfs", mntp, &nfs_vnodeops, &nvp); + error = getnewvnode("nfs", mntp, &nfs_vnodeops, &nvp); if (error) { uma_zfree(nfsnode_zone, np); return (error); } vp = nvp; - if (nmp->nm_flag & NFSMNT_NFSV4) - vp->v_bufobj.bo_ops = &buf_ops_nfs4; - else - vp->v_bufobj.bo_ops = &buf_ops_nfs; + vp->v_bufobj.bo_ops = &buf_ops_nfs; vp->v_data = np; np->n_vnode = vp; /* diff --git a/sys/nfsclient/nfs_socket.c b/sys/nfsclient/nfs_socket.c index 42ef655..64951fa 100644 --- a/sys/nfsclient/nfs_socket.c +++ b/sys/nfsclient/nfs_socket.c @@ -62,8 +62,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include - #include #include #include @@ -72,8 +70,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include - #ifdef NFS_LEGACYRPC #define TRUE 1 @@ -1145,8 +1141,6 @@ nfs_request(struct vnode *vp, struct mbuf *mrest, int procnum, return (ESTALE); } nmp = VFSTONFS(vp->v_mount); - if ((nmp->nm_flag & NFSMNT_NFSV4) != 0) - return nfs4_request(vp, mrest, procnum, td, cred, mrp, mdp, dposp); rep = malloc(sizeof(struct nfsreq), M_NFSREQ, M_WAITOK); bzero(rep, sizeof(struct nfsreq)); rep->r_nmp = nmp; @@ -1747,8 +1741,6 @@ nfs_sigintr(struct nfsmount *nmp, struct nfsreq *rep, struct thread *td) struct proc *p; sigset_t tmpset; - if ((nmp->nm_flag & NFSMNT_NFSV4) != 0) - return nfs4_sigintr(nmp, rep, td); if (rep) { mtx_lock(&rep->r_mtx); if (rep->r_flags & R_SOFTTERM) { diff --git a/sys/nfsclient/nfs_subs.c b/sys/nfsclient/nfs_subs.c index 1453dbf..71d4fb1 100644 --- a/sys/nfsclient/nfs_subs.c +++ b/sys/nfsclient/nfs_subs.c @@ -65,8 +65,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include - #include #include #include diff --git a/sys/nfsclient/nfs_vfsops.c b/sys/nfsclient/nfs_vfsops.c index d8ce36c..7d48023 100644 --- a/sys/nfsclient/nfs_vfsops.c +++ b/sys/nfsclient/nfs_vfsops.c @@ -66,7 +66,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include #include diff --git a/sys/nfsclient/nfs_vnops.c b/sys/nfsclient/nfs_vnops.c index 27d2c59..9f0d67a 100644 --- a/sys/nfsclient/nfs_vnops.c +++ b/sys/nfsclient/nfs_vnops.c @@ -70,8 +70,6 @@ __FBSDID("$FreeBSD$"); #include -#include - #include #include #include diff --git a/sys/nfsclient/nfsm_subs.h b/sys/nfsclient/nfsm_subs.h index 3dd817f..51d2611 100644 --- a/sys/nfsclient/nfsm_subs.h +++ b/sys/nfsclient/nfsm_subs.h @@ -147,17 +147,6 @@ do { \ } \ } while (0) -#define nfsm_request_mnt(n, t, p, c) \ -do { \ - error = nfs4_request_mnt((n), mreq, (t), (p), (c), &mrep, &md, &dpos); \ - if (error != 0) { \ - if (error & NFSERR_RETERR) \ - error &= ~NFSERR_RETERR; \ - else \ - goto nfsmout; \ - } \ -} while (0) - /* *********************************** */ /* Reply interpretation phase macros */ diff --git a/sys/nfsclient/nfsmount.h b/sys/nfsclient/nfsmount.h index 75360fe..85f8501 100644 --- a/sys/nfsclient/nfsmount.h +++ b/sys/nfsclient/nfsmount.h @@ -79,7 +79,6 @@ struct nfsmount { int nm_numgrps; /* Max. size of groupslist */ u_char nm_fh[NFSX_V4FH]; /* File handle of root dir */ int nm_fhsize; /* Size of root file handle */ - struct rpcclnt nm_rpcclnt; /* rpc state */ #ifdef NFS_LEGACYRPC struct socket *nm_so; /* Rpc socket */ #endif diff --git a/sys/nfsclient/nfsnode.h b/sys/nfsclient/nfsnode.h index 6f10d79..29198d8 100644 --- a/sys/nfsclient/nfsnode.h +++ b/sys/nfsclient/nfsnode.h @@ -135,8 +135,6 @@ struct nfsnode { short n_fhsize; /* size in bytes, of fh */ short n_flag; /* Flag for locking.. */ nfsfh_t n_fh; /* Small File Handle */ - struct nfs4_fctx n_rfc; - struct nfs4_fctx n_wfc; u_char *n_name; /* leaf name, for v4 OPEN op */ uint32_t n_namelen; int n_directio_opens; @@ -188,9 +186,7 @@ extern struct nfsmount *nfs_iodmount[NFS_MAXASYNCDAEMON]; extern struct vop_vector nfs_fifoops; extern struct vop_vector nfs_vnodeops; -extern struct vop_vector nfs4_vnodeops; extern struct buf_ops buf_ops_nfs; -extern struct buf_ops buf_ops_nfs4; extern vop_advlock_t *nfs_advlock_p; extern vop_reclaim_t *nfs_reclaim_p; @@ -206,12 +202,9 @@ int nfs_reclaim(struct vop_reclaim_args *); /* other stuff */ int nfs_removeit(struct sillyrename *); -int nfs4_removeit(struct sillyrename *); int nfs_nget(struct mount *, nfsfh_t *, int, struct nfsnode **, int flags); nfsuint64 *nfs_getcookie(struct nfsnode *, off_t, int); -uint64_t *nfs4_getcookie(struct nfsnode *, off_t, int); void nfs_invaldir(struct vnode *); -void nfs4_invaldir(struct vnode *); int nfs_upgrade_vnlock(struct vnode *vp); void nfs_downgrade_vnlock(struct vnode *vp, int old_lock); void nfs_printf(const char *fmt, ...); -- cgit v1.1