Date: Thu, 31 Dec 2009 07:34:39 +0000 (UTC) From: Jaakko Heinonen <jh@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r201331 - stable/8/sys/fs/nfsclient Message-ID: <200912310734.nBV7Yd1Z089836@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jh Date: Thu Dec 31 07:34:38 2009 New Revision: 201331 URL: http://svn.freebsd.org/changeset/base/201331 Log: MFC r198291: Unloading of the nfscl module is unsupported because newnfslock doesn't support unloading. It's not trivial to implement newnfslock unloading so for now just admit that unloading is unsupported and refuse to attempt unload in all nfscl module event handlers. Approved by: trasz (mentor) Modified: stable/8/sys/fs/nfsclient/nfs_clport.c stable/8/sys/fs/nfsclient/nfs_clsubs.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) stable/8/sys/dev/xen/xenpci/ (props changed) Modified: stable/8/sys/fs/nfsclient/nfs_clport.c ============================================================================== --- stable/8/sys/fs/nfsclient/nfs_clport.c Thu Dec 31 07:32:04 2009 (r201330) +++ stable/8/sys/fs/nfsclient/nfs_clport.c Thu Dec 31 07:34:38 2009 (r201331) @@ -1243,6 +1243,10 @@ nfscl_modevent(module_t mod, int type, v break; } + /* + * XXX: Unloading of nfscl module is unsupported. + */ +#if 0 ncl_call_invalcaches = NULL; nfsd_call_nfscl = NULL; /* and get rid of the mutexes */ @@ -1250,6 +1254,9 @@ nfscl_modevent(module_t mod, int type, v mtx_destroy(&ncl_iod_mutex); loaded = 0; break; +#else + /* FALLTHROUGH */ +#endif default: error = EOPNOTSUPP; break; Modified: stable/8/sys/fs/nfsclient/nfs_clsubs.c ============================================================================== --- stable/8/sys/fs/nfsclient/nfs_clsubs.c Thu Dec 31 07:32:04 2009 (r201330) +++ stable/8/sys/fs/nfsclient/nfs_clsubs.c Thu Dec 31 07:34:38 2009 (r201331) @@ -87,6 +87,10 @@ extern struct nfsstats newnfsstats; int ncl_uninit(struct vfsconf *vfsp) { + /* + * XXX: Unloading of nfscl module is unsupported. + */ +#if 0 int i; /* @@ -104,6 +108,9 @@ ncl_uninit(struct vfsconf *vfsp) mtx_unlock(&ncl_iod_mutex); ncl_nhuninit(); return (0); +#else + return (EOPNOTSUPP); +#endif } void
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200912310734.nBV7Yd1Z089836>