Date: Thu, 30 Dec 2010 09:45:26 +0000 (UTC) From: Pawel Jakub Dawidek <pjd@FreeBSD.org> To: cvs-src-old@freebsd.org Subject: cvs commit: src/sys/nfsserver nfs.h nfs_serv.c nfs_srvsubs.c Message-ID: <201012300945.oBU9jhbJ078911@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
pjd 2010-12-30 09:45:26 UTC
FreeBSD src repository
Modified files: (Branch: RELENG_8)
sys/nfsserver nfs.h nfs_serv.c nfs_srvsubs.c
Log:
SVN rev 216815 on 2010-12-30 09:45:26Z by pjd
MFC r216565,r216631,r216632,r216633,r216774:
r216565:
Reduce lock scope a little.
r216631:
On error, unbusy file system and jump to the end, so we won't try to unlock
NULL *vpp.
Reviewed by: kib
r216632:
- Move pubflag and lockflag handling from nfsrv_fhtovp() to nfs_namei() -
this is the only place that is different from all the other nfsrv_fhtovp()
consumers.
This simplifies nfsrv_fhtovp() a bit and also eliminates one
vn_lock/VOP_UNLOCK() cycle in case of NFSv3.
- Implement NFSRV_FLAG_BUSY flag for nfsrv_fhtovp() that tells it to leave
mount point busy.
Reviewed by: kib
r216633:
Use newly added NFSRV_FLAG_BUSY flag for nfsrv_fhtovp() to keep mount point
busy. This fixes a race where we can pass invalid mount point to VFS_VGET()
via vp->v_mount when exported file system was forcibly unmounted between
nfsrv_fhtovp() and VFS_VGET().
Reviewed by: kib
r216774:
ZFS might not return monotonically increasing directory offset cookies,
so turn off UFS-specific hack that assumes so in ZFS case.
Before the change we can miss returning some directory entries to a
NFS client.
I believe that the hack should be moved to ufs_readdir(), but until we find
somebody who will do it, turn it off for ZFS in NFS server code.
Submitted by: rmacklem
Discussed with: rmacklem, mckusick
Revision Changes Path
1.90.2.5 +7 -1 src/sys/nfsserver/nfs.h
1.195.2.9 +41 -39 src/sys/nfsserver/nfs_serv.c
1.167.2.4 +17 -14 src/sys/nfsserver/nfs_srvsubs.c
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201012300945.oBU9jhbJ078911>