Author: rmacklem
Date: Thu Jan 6 20:31:33 2011
New Revision: 217066
URL: http://svn.freebsd.org/changeset/base/217066
Log:
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.
MFC after: 12 days
Modified:
head/sys/fs/nfs/nfsport.h
head/sys/fs/nfsserver/nfs_nfsdstate.c
Modified: head/sys/fs/nfs/nfsport.h
==============================================================================
--- head/sys/fs/nfs/nfsport.h Thu Jan 6 20:19:01 2011 (r217065)
+++ head/sys/fs/nfs/nfsport.h Thu Jan 6 20:31:33 2011 (r217066)
@@ -596,13 +596,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: head/sys/fs/nfsserver/nfs_nfsdstate.c
==============================================================================
--- head/sys/fs/nfsserver/nfs_nfsdstate.c Thu Jan 6 20:19:01 2011
(r217065)
+++ head/sys/fs/nfsserver/nfs_nfsdstate.c Thu Jan 6 20:31:33 2011
(r217066)
@@ -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,
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
