d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Delete the NFS_STARTWRITE() and NFS_ENDWRITE() macros that

Browse Source 
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
This commit is contained in:
rmacklem 2011-01-06 20:31:33 +00:00
parent b3910b1de1
commit 046d272b77
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/fs/nfs/nfsport.h
View File

@ -595,13 +595,6 @@ int nfsmsleep(void *, void *, int, const char *, struct timespec *);
#define PDIRUNLOCK 0x0
#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.
*/

4
sys/fs/nfsserver/nfs_nfsdstate.c
View File

@ -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,