From owner-svn-src-stable-8@FreeBSD.ORG Sun Aug 1 15:55:50 2010 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 23C491065677; Sun, 1 Aug 2010 15:55:50 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 07ED28FC17; Sun, 1 Aug 2010 15:55:50 +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 o71Ftnxd046658; Sun, 1 Aug 2010 15:55:49 GMT (envelope-from rmacklem@svn.freebsd.org) Received: (from rmacklem@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o71FtnAQ046656; Sun, 1 Aug 2010 15:55:49 GMT (envelope-from rmacklem@svn.freebsd.org) Message-Id: <201008011555.o71FtnAQ046656@svn.freebsd.org> From: Rick Macklem Date: Sun, 1 Aug 2010 15:55:49 +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: r210735 - stable/8/sys/fs/nfsserver X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Aug 2010 15:55:50 -0000 Author: rmacklem Date: Sun Aug 1 15:55:49 2010 New Revision: 210735 URL: http://svn.freebsd.org/changeset/base/210735 Log: MFC: r210154 Delete comments related to soft clock interrupts that don't apply to the FreeBSD port of the experimental NFSv4 server. Modified: stable/8/sys/fs/nfsserver/nfs_nfsdstate.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/nfsserver/nfs_nfsdstate.c ============================================================================== --- stable/8/sys/fs/nfsserver/nfs_nfsdstate.c Sun Aug 1 15:41:00 2010 (r210734) +++ stable/8/sys/fs/nfsserver/nfs_nfsdstate.c Sun Aug 1 15:55:49 2010 (r210735) @@ -1015,7 +1015,6 @@ nfsrv_freedeleg(struct nfsstate *stp) /* * This function frees an open owner and all associated opens. - * Must be called with soft clock interrupts disabled. */ static void nfsrv_freeopenowner(struct nfsstate *stp, int cansleep, NFSPROC_T *p) @@ -1161,7 +1160,6 @@ nfsrv_freeallnfslocks(struct nfsstate *s /* * Free an nfslock structure. - * Must be called with soft clock interrupts disabled. */ static void nfsrv_freenfslock(struct nfslock *lop) @@ -1178,7 +1176,6 @@ nfsrv_freenfslock(struct nfslock *lop) /* * This function frees an nfslockfile structure. - * Must be called with soft clock interrupts disabled. */ static void nfsrv_freenfslockfile(struct nfslockfile *lfp) @@ -1358,11 +1355,6 @@ tryagain: } } - /* - * Since the code is manipulating lists that are also - * manipulated by nfsrv_servertimer(), soft clock interrupts - * must be masked off. - */ if (specialid == 0) { if (new_stp->ls_flags & NFSLCK_TEST) { /* @@ -1971,9 +1963,6 @@ tryagain: NFSLOCKSTATE(); /* * Get the nfsclient structure. - * Since the code is manipulating lists that are also - * manipulated by nfsrv_servertimer(), soft clock interrupts - * must be masked off. */ error = nfsrv_getclient(clientid, CLOPS_RENEW, &clp, (nfsquad_t)((u_quad_t)0), NULL, p); @@ -3176,7 +3165,6 @@ nfsrv_getlockfile(u_short flags, struct * This function adds a nfslock lock structure to the list for the associated * nfsstate and nfslockfile structures. It will be inserted after the * entry pointed at by insert_lop. - * Must be called with soft clock interrupts disabled. */ static void nfsrv_insertlock(struct nfslock *new_lop, struct nfslock *insert_lop, @@ -3228,7 +3216,6 @@ nfsrv_insertlock(struct nfslock *new_lop * are NFSLCK_READ or NFSLCK_WRITE and non-overlapping (aka POSIX style). * It always adds new_lop to the list and sometimes uses the one pointed * at by other_lopp. - * Must be called with soft clock interrupts disabled. */ static void nfsrv_updatelock(struct nfsstate *stp, struct nfslock **new_lopp,