Date: Tue, 23 Dec 2014 00:47:47 +0000 (UTC) From: Rick Macklem <rmacklem@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r276096 - in head/sys: arm/conf conf fs/nfs fs/nfsclient modules modules/dtrace modules/dtrace/dtnfsclient modules/dtrace/dtraceall modules/nfs_common modules/nfsclient modules/nfsserve... Message-ID: <201412230047.sBN0llBU070080@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rmacklem Date: Tue Dec 23 00:47:46 2014 New Revision: 276096 URL: https://svnweb.freebsd.org/changeset/base/276096 Log: Remove the old NFS client and server from head, which means that the NFSCLIENT and NFSSERVER kernel options will no longer work. This commit only removes the kernel components. Removal of unused code in the user utilities will be done later. This commit does not include an addition to UPDATING, but that will be committed in a few minutes. Discussed on: freebsd-fs Deleted: head/sys/modules/dtrace/dtnfsclient/ head/sys/modules/nfs_common/ head/sys/modules/nfsclient/ head/sys/modules/nfsserver/ head/sys/nfs/nfs_common.c head/sys/nfsclient/nfs_bio.c head/sys/nfsclient/nfs_kdtrace.c head/sys/nfsclient/nfs_krpc.c head/sys/nfsclient/nfs_nfsiod.c head/sys/nfsclient/nfs_node.c head/sys/nfsclient/nfs_subs.c head/sys/nfsclient/nfs_vfsops.c head/sys/nfsclient/nfs_vnops.c head/sys/nfsserver/nfs_fha_old.c head/sys/nfsserver/nfs_serv.c head/sys/nfsserver/nfs_srvkrpc.c head/sys/nfsserver/nfs_srvsubs.c Modified: head/sys/arm/conf/DOCKSTAR head/sys/arm/conf/DREAMPLUG-1001 head/sys/arm/conf/EA3250 head/sys/conf/NOTES head/sys/conf/files head/sys/conf/options head/sys/fs/nfs/nfs_commonkrpc.c head/sys/fs/nfsclient/nfs_clnode.c head/sys/fs/nfsclient/nfs_clport.c head/sys/fs/nfsclient/nfs_clvfsops.c head/sys/modules/Makefile head/sys/modules/dtrace/Makefile head/sys/modules/dtrace/dtraceall/dtraceall.c head/sys/nfs/bootp_subr.c head/sys/sys/param.h Modified: head/sys/arm/conf/DOCKSTAR ============================================================================== --- head/sys/arm/conf/DOCKSTAR Mon Dec 22 23:03:18 2014 (r276095) +++ head/sys/arm/conf/DOCKSTAR Tue Dec 23 00:47:46 2014 (r276096) @@ -154,7 +154,7 @@ options INVARIANT_SUPPORT # Extra sanit # Enable these options for nfs root configured via BOOTP. options NFSCL # Network Filesystem Client options NFSLOCKD # Network Lock Manager -#options NFS_ROOT # NFS usable as /, requires NFSCLIENT +#options NFS_ROOT # NFS usable as /, requires NFSCL #options BOOTP #options BOOTP_NFSROOT #options BOOTP_NFSV3 Modified: head/sys/arm/conf/DREAMPLUG-1001 ============================================================================== --- head/sys/arm/conf/DREAMPLUG-1001 Mon Dec 22 23:03:18 2014 (r276095) +++ head/sys/arm/conf/DREAMPLUG-1001 Tue Dec 23 00:47:46 2014 (r276096) @@ -162,7 +162,7 @@ options INVARIANT_SUPPORT # Extra sanit # Enable these options for nfs root configured via BOOTP. options NFSCL # Network Filesystem Client options NFSLOCKD # Network Lock Manager -#options NFS_ROOT # NFS usable as /, requires NFSCLIENT +#options NFS_ROOT # NFS usable as /, requires NFSCL #options BOOTP #options BOOTP_NFSROOT #options BOOTP_NFSV3 Modified: head/sys/arm/conf/EA3250 ============================================================================== --- head/sys/arm/conf/EA3250 Mon Dec 22 23:03:18 2014 (r276095) +++ head/sys/arm/conf/EA3250 Tue Dec 23 00:47:46 2014 (r276096) @@ -19,7 +19,7 @@ options INET6 # IPv6 communications p options FFS # Berkeley Fast Filesystem options NFSCL # Network Filesystem Client options NFSLOCKD # Network Lock Manager -options NFS_ROOT # NFS usable as /, requires NFSCLIENT +options NFS_ROOT # NFS usable as /, requires NFSCL options GEOM_PART_BSD # BSD partition scheme options GEOM_PART_MBR # MBR partition scheme options TMPFS # Efficient memory filesystem Modified: head/sys/conf/NOTES ============================================================================== --- head/sys/conf/NOTES Mon Dec 22 23:03:18 2014 (r276095) +++ head/sys/conf/NOTES Tue Dec 23 00:47:46 2014 (r276096) @@ -1019,7 +1019,7 @@ options DUMMYNET # One of these is mandatory: options FFS #Fast filesystem -options NFSCLIENT #Network File System client +options NFSCL #Network File System client # The rest are optional: options AUTOFS #Automounter filesystem @@ -1027,7 +1027,6 @@ options CD9660 #ISO 9660 filesystem options FDESCFS #File descriptor filesystem options FUSE #FUSE support module options MSDOSFS #MS DOS File System (FAT, FAT32) -options NFSSERVER #Network File System server options NFSLOCKD #Network Lock Manager options NFSCL #New Network Filesystem Client options NFSD #New Network Filesystem Server @@ -2596,7 +2595,7 @@ device pcfclock # Kernel BOOTP support options BOOTP # Use BOOTP to obtain IP address/hostname - # Requires NFSCLIENT and NFS_ROOT + # Requires NFSCL and NFS_ROOT options BOOTP_NFSROOT # NFS mount root filesystem using BOOTP info options BOOTP_NFSV3 # Use NFS v3 to NFS mount root options BOOTP_COMPAT # Workaround for broken bootp daemons. Modified: head/sys/conf/files ============================================================================== --- head/sys/conf/files Mon Dec 22 23:03:18 2014 (r276095) +++ head/sys/conf/files Tue Dec 23 00:47:46 2014 (r276096) @@ -3559,24 +3559,12 @@ netsmb/smb_smb.c optional netsmb netsmb/smb_subr.c optional netsmb netsmb/smb_trantcp.c optional netsmb netsmb/smb_usr.c optional netsmb -nfs/bootp_subr.c optional bootp nfsclient | bootp nfscl -nfs/krpc_subr.c optional bootp nfsclient | bootp nfscl -nfs/nfs_common.c optional nfsclient | nfsserver -nfs/nfs_diskless.c optional nfsclient nfs_root | nfscl nfs_root -nfs/nfs_fha.c optional nfsserver | nfsd -nfs/nfs_lock.c optional nfsclient | nfscl | nfslockd | nfsd -nfsclient/nfs_bio.c optional nfsclient -nfsclient/nfs_node.c optional nfsclient -nfsclient/nfs_krpc.c optional nfsclient -nfsclient/nfs_subs.c optional nfsclient -nfsclient/nfs_nfsiod.c optional nfsclient -nfsclient/nfs_vfsops.c optional nfsclient -nfsclient/nfs_vnops.c optional nfsclient -nfsserver/nfs_fha_old.c optional nfsserver -nfsserver/nfs_serv.c optional nfsserver -nfsserver/nfs_srvkrpc.c optional nfsserver -nfsserver/nfs_srvsubs.c optional nfsserver -nfs/nfs_nfssvc.c optional nfsserver | nfscl | nfsd +nfs/bootp_subr.c optional bootp nfscl +nfs/krpc_subr.c optional bootp nfscl +nfs/nfs_diskless.c optional nfscl nfs_root +nfs/nfs_fha.c optional nfsd +nfs/nfs_lock.c optional nfscl | nfslockd | nfsd +nfs/nfs_nfssvc.c optional nfscl | nfsd nlm/nlm_advlock.c optional nfslockd | nfsd nlm/nlm_prot_clnt.c optional nfslockd | nfsd nlm/nlm_prot_impl.c optional nfslockd | nfsd @@ -3887,26 +3875,26 @@ opencrypto/gfmult.c optional crypto opencrypto/rmd160.c optional crypto | ipsec opencrypto/skipjack.c optional crypto opencrypto/xform.c optional crypto -rpc/auth_none.c optional krpc | nfslockd | nfsclient | nfsserver | nfscl | nfsd -rpc/auth_unix.c optional krpc | nfslockd | nfsclient | nfscl | nfsd -rpc/authunix_prot.c optional krpc | nfslockd | nfsclient | nfsserver | nfscl | nfsd -rpc/clnt_bck.c optional krpc | nfslockd | nfsserver | nfscl | nfsd -rpc/clnt_dg.c optional krpc | nfslockd | nfsclient | nfscl | nfsd -rpc/clnt_rc.c optional krpc | nfslockd | nfsclient | nfscl | nfsd -rpc/clnt_vc.c optional krpc | nfslockd | nfsclient | nfsserver | nfscl | nfsd -rpc/getnetconfig.c optional krpc | nfslockd | nfsclient | nfsserver | nfscl | nfsd -rpc/replay.c optional krpc | nfslockd | nfsclient | nfsserver | nfscl | nfsd -rpc/rpc_callmsg.c optional krpc | nfslockd | nfsclient | nfsserver | nfscl | nfsd -rpc/rpc_generic.c optional krpc | nfslockd | nfsclient | nfsserver | nfscl | nfsd -rpc/rpc_prot.c optional krpc | nfslockd | nfsclient | nfsserver | nfscl | nfsd -rpc/rpcb_clnt.c optional krpc | nfslockd | nfsclient | nfsserver | nfscl | nfsd -rpc/rpcb_prot.c optional krpc | nfslockd | nfsclient | nfsserver | nfscl | nfsd -rpc/svc.c optional krpc | nfslockd | nfsclient | nfsserver | nfscl | nfsd -rpc/svc_auth.c optional krpc | nfslockd | nfsclient | nfsserver | nfscl | nfsd -rpc/svc_auth_unix.c optional krpc | nfslockd | nfsclient | nfsserver | nfscl | nfsd -rpc/svc_dg.c optional krpc | nfslockd | nfsserver | nfscl | nfsd -rpc/svc_generic.c optional krpc | nfslockd | nfsserver | nfscl | nfsd -rpc/svc_vc.c optional krpc | nfslockd | nfsserver | nfscl | nfsd +rpc/auth_none.c optional krpc | nfslockd | nfscl | nfsd +rpc/auth_unix.c optional krpc | nfslockd | nfscl | nfsd +rpc/authunix_prot.c optional krpc | nfslockd | nfscl | nfsd +rpc/clnt_bck.c optional krpc | nfslockd | nfscl | nfsd +rpc/clnt_dg.c optional krpc | nfslockd | nfscl | nfsd +rpc/clnt_rc.c optional krpc | nfslockd | nfscl | nfsd +rpc/clnt_vc.c optional krpc | nfslockd | nfscl | nfsd +rpc/getnetconfig.c optional krpc | nfslockd | nfscl | nfsd +rpc/replay.c optional krpc | nfslockd | nfscl | nfsd +rpc/rpc_callmsg.c optional krpc | nfslockd | nfscl | nfsd +rpc/rpc_generic.c optional krpc | nfslockd | nfscl | nfsd +rpc/rpc_prot.c optional krpc | nfslockd | nfscl | nfsd +rpc/rpcb_clnt.c optional krpc | nfslockd | nfscl | nfsd +rpc/rpcb_prot.c optional krpc | nfslockd | nfscl | nfsd +rpc/svc.c optional krpc | nfslockd | nfscl | nfsd +rpc/svc_auth.c optional krpc | nfslockd | nfscl | nfsd +rpc/svc_auth_unix.c optional krpc | nfslockd | nfscl | nfsd +rpc/svc_dg.c optional krpc | nfslockd | nfscl | nfsd +rpc/svc_generic.c optional krpc | nfslockd | nfscl | nfsd +rpc/svc_vc.c optional krpc | nfslockd | nfscl | nfsd rpc/rpcsec_gss/rpcsec_gss.c optional krpc kgssapi | nfslockd kgssapi | nfscl kgssapi | nfsd kgssapi rpc/rpcsec_gss/rpcsec_gss_conf.c optional krpc kgssapi | nfslockd kgssapi | nfscl kgssapi | nfsd kgssapi rpc/rpcsec_gss/rpcsec_gss_misc.c optional krpc kgssapi | nfslockd kgssapi | nfscl kgssapi | nfsd kgssapi @@ -4012,9 +4000,9 @@ xen/xenbus/xenbusb_if.m optional xen | xen/xenbus/xenbusb.c optional xen | xenhvm xen/xenbus/xenbusb_front.c optional xen | xenhvm xen/xenbus/xenbusb_back.c optional xen | xenhvm -xdr/xdr.c optional krpc | nfslockd | nfsclient | nfsserver | nfscl | nfsd -xdr/xdr_array.c optional krpc | nfslockd | nfsclient | nfsserver | nfscl | nfsd -xdr/xdr_mbuf.c optional krpc | nfslockd | nfsclient | nfsserver | nfscl | nfsd -xdr/xdr_mem.c optional krpc | nfslockd | nfsclient | nfsserver | nfscl | nfsd -xdr/xdr_reference.c optional krpc | nfslockd | nfsclient | nfsserver | nfscl | nfsd -xdr/xdr_sizeof.c optional krpc | nfslockd | nfsclient | nfsserver | nfscl | nfsd +xdr/xdr.c optional krpc | nfslockd | nfscl | nfsd +xdr/xdr_array.c optional krpc | nfslockd | nfscl | nfsd +xdr/xdr_mbuf.c optional krpc | nfslockd | nfscl | nfsd +xdr/xdr_mem.c optional krpc | nfslockd | nfscl | nfsd +xdr/xdr_reference.c optional krpc | nfslockd | nfscl | nfsd +xdr/xdr_sizeof.c optional krpc | nfslockd | nfscl | nfsd Modified: head/sys/conf/options ============================================================================== --- head/sys/conf/options Mon Dec 22 23:03:18 2014 (r276095) +++ head/sys/conf/options Tue Dec 23 00:47:46 2014 (r276096) @@ -253,11 +253,6 @@ KGSSAPI_DEBUG opt_kgssapi.h # sys/i386/i386/autoconf.c. If any of these filesystems are # statically compiled into the kernel, code for mounting them as root # filesystems will be enabled - but look below. -NFSCLIENT opt_nfs.h -NFSSERVER opt_nfs.h - -# Use these options to compile the experimental nfs client and/or -# server that supports NFSv4 into a kernel. # NFSCL - client # NFSD - server NFSCL opt_nfs.h Modified: head/sys/fs/nfs/nfs_commonkrpc.c ============================================================================== --- head/sys/fs/nfs/nfs_commonkrpc.c Mon Dec 22 23:03:18 2014 (r276095) +++ head/sys/fs/nfs/nfs_commonkrpc.c Tue Dec 23 00:47:46 2014 (r276096) @@ -260,7 +260,7 @@ newnfs_connect(struct nfsmount *nmp, str client = clnt_reconnect_create(nconf, saddr, nrp->nr_prog, nrp->nr_vers, sndreserve, rcvreserve); - CLNT_CONTROL(client, CLSET_WAITCHAN, "newnfsreq"); + CLNT_CONTROL(client, CLSET_WAITCHAN, "nfsreq"); if (nmp != NULL) { if ((nmp->nm_flag & NFSMNT_INT)) CLNT_CONTROL(client, CLSET_INTERRUPTIBLE, &one); @@ -1166,10 +1166,10 @@ nfs_msg(struct thread *td, const char *s p = td ? td->td_proc : NULL; if (error) { - tprintf(p, LOG_INFO, "newnfs server %s: %s, error %d\n", + tprintf(p, LOG_INFO, "nfs server %s: %s, error %d\n", server, msg, error); } else { - tprintf(p, LOG_INFO, "newnfs server %s: %s\n", server, msg); + tprintf(p, LOG_INFO, "nfs server %s: %s\n", server, msg); } return (0); } Modified: head/sys/fs/nfsclient/nfs_clnode.c ============================================================================== --- head/sys/fs/nfsclient/nfs_clnode.c Mon Dec 22 23:03:18 2014 (r276095) +++ head/sys/fs/nfsclient/nfs_clnode.c Tue Dec 23 00:47:46 2014 (r276096) @@ -122,7 +122,7 @@ ncl_nget(struct mount *mntp, u_int8_t *f } np = uma_zalloc(newnfsnode_zone, M_WAITOK | M_ZERO); - error = getnewvnode("newnfs", mntp, &newnfs_vnodeops, &nvp); + error = getnewvnode("nfs", mntp, &newnfs_vnodeops, &nvp); if (error) { uma_zfree(newnfsnode_zone, np); return (error); Modified: head/sys/fs/nfsclient/nfs_clport.c ============================================================================== --- head/sys/fs/nfsclient/nfs_clport.c Mon Dec 22 23:03:18 2014 (r276095) +++ head/sys/fs/nfsclient/nfs_clport.c Tue Dec 23 00:47:46 2014 (r276096) @@ -198,7 +198,7 @@ nfscl_nget(struct mount *mntp, struct vn } np = uma_zalloc(newnfsnode_zone, M_WAITOK | M_ZERO); - error = getnewvnode("newnfs", mntp, &newnfs_vnodeops, &nvp); + error = getnewvnode("nfs", mntp, &newnfs_vnodeops, &nvp); if (error) { uma_zfree(newnfsnode_zone, np); FREE((caddr_t)nfhp, M_NFSFH); Modified: head/sys/fs/nfsclient/nfs_clvfsops.c ============================================================================== --- head/sys/fs/nfsclient/nfs_clvfsops.c Mon Dec 22 23:03:18 2014 (r276095) +++ head/sys/fs/nfsclient/nfs_clvfsops.c Tue Dec 23 00:47:46 2014 (r276096) @@ -152,7 +152,7 @@ MODULE_DEPEND(nfs, nfslock, 1, 1, 1); * will be defined for kernels built without NFS_ROOT, although it * isn't used in that case. */ -#if !defined(NFS_ROOT) && !defined(NFSCLIENT) +#if !defined(NFS_ROOT) struct nfs_diskless nfs_diskless = { { { 0 } } }; struct nfsv3_diskless nfsv3_diskless = { { { 0 } } }; int nfs_diskless_valid = 0; @@ -704,7 +704,7 @@ nfs_decode_args(struct mount *mp, struct while (newnfs_connect(nmp, &nmp->nm_sockreq, cred, td, 0)) { printf("newnfs_args: retrying connect\n"); - (void) nfs_catnap(PSOCK, 0, "newnfscon"); + (void) nfs_catnap(PSOCK, 0, "nfscon"); } } } else { @@ -1063,7 +1063,7 @@ nfs_mount(struct mount *mp) * greater than NFS_MAXDGRAMDATA, those thread(s) will be * hung, retrying the RPC(s) forever. Usually these threads * will be seen doing an uninterruptible sleep on wait channel - * "newnfsreq" (truncated to "newnfsre" by procstat). + * "nfsreq". */ if (args.sotype == SOCK_DGRAM && nmp->nm_sotype == SOCK_STREAM) tprintf(td->td_proc, LOG_WARNING, Modified: head/sys/modules/Makefile ============================================================================== --- head/sys/modules/Makefile Mon Dec 22 23:03:18 2014 (r276095) +++ head/sys/modules/Makefile Tue Dec 23 00:47:46 2014 (r276096) @@ -248,14 +248,11 @@ SUBDIR= \ netfpga10g \ ${_netgraph} \ ${_nfe} \ - nfs_common \ nfscl \ - nfsclient \ nfscommon \ nfsd \ nfslock \ nfslockd \ - nfsserver \ nfssvc \ nge \ nmdm \ Modified: head/sys/modules/dtrace/Makefile ============================================================================== --- head/sys/modules/dtrace/Makefile Mon Dec 22 23:03:18 2014 (r276095) +++ head/sys/modules/dtrace/Makefile Tue Dec 23 00:47:46 2014 (r276096) @@ -4,7 +4,6 @@ SUBDIR= dtmalloc \ dtnfscl \ - dtnfsclient \ dtrace \ dtraceall \ dtrace_test \ Modified: head/sys/modules/dtrace/dtraceall/dtraceall.c ============================================================================== --- head/sys/modules/dtrace/dtraceall/dtraceall.c Mon Dec 22 23:03:18 2014 (r276095) +++ head/sys/modules/dtrace/dtraceall/dtraceall.c Tue Dec 23 00:47:46 2014 (r276096) @@ -69,9 +69,6 @@ MODULE_DEPEND(dtraceall, dtmalloc, 1, 1, #if defined(NFSCLIENT) MODULE_DEPEND(dtraceall, dtnfscl, 1, 1, 1); #endif -#if defined(NFSCLIENT) -MODULE_DEPEND(dtraceall, dtnfsclient, 1, 1, 1); -#endif #if defined(__amd64__) || defined(__i386__) || defined(__powerpc__) MODULE_DEPEND(dtraceall, fbt, 1, 1, 1); #endif Modified: head/sys/nfs/bootp_subr.c ============================================================================== --- head/sys/nfs/bootp_subr.c Mon Dec 22 23:03:18 2014 (r276095) +++ head/sys/nfs/bootp_subr.c Tue Dec 23 00:47:46 2014 (r276096) @@ -1735,9 +1735,6 @@ retry: goto out; } rootdevnames[0] = "nfs:"; -#ifdef NFSCLIENT - rootdevnames[1] = "oldnfs:"; -#endif nfs_diskless_valid = 3; } Modified: head/sys/sys/param.h ============================================================================== --- head/sys/sys/param.h Mon Dec 22 23:03:18 2014 (r276095) +++ head/sys/sys/param.h Tue Dec 23 00:47:46 2014 (r276096) @@ -58,7 +58,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 1100050 /* Master, propagated to newvers */ +#define __FreeBSD_version 1100051 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412230047.sBN0llBU070080>