From owner-svn-src-stable-8@FreeBSD.ORG Tue Jan 18 01:07:09 2011 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 84AA6106566B; Tue, 18 Jan 2011 01:07:09 +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 5877D8FC08; Tue, 18 Jan 2011 01:07:09 +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 p0I1795o019161; Tue, 18 Jan 2011 01:07:09 GMT (envelope-from rmacklem@svn.freebsd.org) Received: (from rmacklem@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0I17963019158; Tue, 18 Jan 2011 01:07:09 GMT (envelope-from rmacklem@svn.freebsd.org) Message-Id: <201101180107.p0I17963019158@svn.freebsd.org> From: Rick Macklem Date: Tue, 18 Jan 2011 01:07:09 +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: r217526 - in stable/8/sys/fs: nfs 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: Tue, 18 Jan 2011 01:07:09 -0000 Author: rmacklem Date: Tue Jan 18 01:07:09 2011 New Revision: 217526 URL: http://svn.freebsd.org/changeset/base/217526 Log: MFC: r217066 Delete the NFS_STARTWRITE() and NFS_ENDWRITE() macros that obscured vn_start_write() and vn_finished_write() for the old OpenBSD port, since most uses have been replaced by the correct calls. Modified: stable/8/sys/fs/nfs/nfsport.h 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) Modified: stable/8/sys/fs/nfs/nfsport.h ============================================================================== --- stable/8/sys/fs/nfs/nfsport.h Tue Jan 18 00:53:55 2011 (r217525) +++ stable/8/sys/fs/nfs/nfsport.h Tue Jan 18 01:07:09 2011 (r217526) @@ -600,13 +600,6 @@ int nfsmsleep(void *, void *, int, const #define MAX_COMMIT_COUNT (1024 * 1024) /* - * These macros are called at the start and end of operations that - * might modify the underlying file system. - */ -#define NFS_STARTWRITE(v, m) vn_start_write((v), (m), V_WAIT) -#define NFS_ENDWRITE(m) vn_finished_write(m) - -/* * Define these to handle the type of va_rdev. */ #define NFSMAKEDEV(m, n) makedev((m), (n)) Modified: stable/8/sys/fs/nfsserver/nfs_nfsdstate.c ============================================================================== --- stable/8/sys/fs/nfsserver/nfs_nfsdstate.c Tue Jan 18 00:53:55 2011 (r217525) +++ stable/8/sys/fs/nfsserver/nfs_nfsdstate.c Tue Jan 18 01:07:09 2011 (r217526) @@ -4092,14 +4092,14 @@ nfsrv_updatestable(NFSPROC_T *p) NFSVNO_ATTRINIT(&nva); NFSVNO_SETATTRVAL(&nva, size, 0); vp = NFSFPVNODE(sf->nsf_fp); - NFS_STARTWRITE(vp, &mp); + vn_start_write(vp, &mp, V_WAIT); if (vn_lock(vp, LK_EXCLUSIVE) == 0) { error = nfsvno_setattr(vp, &nva, NFSFPCRED(sf->nsf_fp), p, NULL); VOP_UNLOCK(vp, 0); } else error = EPERM; - NFS_ENDWRITE(mp); + vn_finished_write(mp); if (!error) error = NFSD_RDWR(UIO_WRITE, vp, (caddr_t)&sf->nsf_rec, sizeof (struct nfsf_rec), (off_t)0,