From owner-svn-src-all@FreeBSD.ORG Thu Dec 31 07:34:39 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 761F7106566C; Thu, 31 Dec 2009 07:34:39 +0000 (UTC) (envelope-from jh@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 4A2D78FC08; Thu, 31 Dec 2009 07:34:39 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nBV7YdpK089839; Thu, 31 Dec 2009 07:34:39 GMT (envelope-from jh@svn.freebsd.org) Received: (from jh@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBV7Yd1Z089836; Thu, 31 Dec 2009 07:34:39 GMT (envelope-from jh@svn.freebsd.org) Message-Id: <200912310734.nBV7Yd1Z089836@svn.freebsd.org> From: Jaakko Heinonen Date: Thu, 31 Dec 2009 07:34:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r201331 - stable/8/sys/fs/nfsclient X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Dec 2009 07:34:39 -0000 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