diff options
| author | rmacklem <rmacklem@FreeBSD.org> | 2011-01-06 20:31:33 +0000 |
|---|---|---|
| committer | rmacklem <rmacklem@FreeBSD.org> | 2011-01-06 20:31:33 +0000 |
| commit | 046d272b7747c06fd2a5e8c9ab640e5dfc88d251 (patch) | |
| tree | e76792a19b0d7e12c03dbd956199bb9869409bc8 | |
| parent | b3910b1de1b8d471bd61ec5de83e1a07d03ea512 (diff) | |
| download | FreeBSD-src-046d272b7747c06fd2a5e8c9ab640e5dfc88d251.zip FreeBSD-src-046d272b7747c06fd2a5e8c9ab640e5dfc88d251.tar.gz | |
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
| -rw-r--r-- | sys/fs/nfs/nfsport.h | 7 | ||||
| -rw-r--r-- | sys/fs/nfsserver/nfs_nfsdstate.c | 4 |
2 files changed, 2 insertions, 9 deletions
diff --git a/sys/fs/nfs/nfsport.h b/sys/fs/nfs/nfsport.h index 40dfe6c..961d9d3 100644 --- a/sys/fs/nfs/nfsport.h +++ b/sys/fs/nfs/nfsport.h @@ -596,13 +596,6 @@ int nfsmsleep(void *, void *, int, const char *, struct timespec *); #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)) diff --git a/sys/fs/nfsserver/nfs_nfsdstate.c b/sys/fs/nfsserver/nfs_nfsdstate.c index 6e66d54..12347f7 100644 --- a/sys/fs/nfsserver/nfs_nfsdstate.c +++ b/sys/fs/nfsserver/nfs_nfsdstate.c @@ -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, |
