svn commit: r216565 - head/sys/nfsserver
Pawel Jakub Dawidek
pjd at FreeBSD.org
Sun Dec 19 18:06:21 UTC 2010
Author: pjd
Date: Sun Dec 19 18:06:20 2010
New Revision: 216565
URL: http://svn.freebsd.org/changeset/base/216565
Log:
Reduce lock scope a little.
Modified:
head/sys/nfsserver/nfs_serv.c
Modified: head/sys/nfsserver/nfs_serv.c
==============================================================================
--- head/sys/nfsserver/nfs_serv.c Sun Dec 19 16:25:23 2010 (r216564)
+++ head/sys/nfsserver/nfs_serv.c Sun Dec 19 18:06:20 2010 (r216565)
@@ -2826,11 +2826,11 @@ again:
io.uio_rw = UIO_READ;
io.uio_td = NULL;
eofflag = 0;
- vn_lock(vp, LK_SHARED | LK_RETRY);
if (cookies) {
free((caddr_t)cookies, M_TEMP);
cookies = NULL;
}
+ vn_lock(vp, LK_SHARED | LK_RETRY);
error = VOP_READDIR(vp, &io, cred, &eofflag, &ncookies, &cookies);
off = (off_t)io.uio_offset;
if (!cookies && !error)
@@ -3114,12 +3114,12 @@ again:
io.uio_rw = UIO_READ;
io.uio_td = NULL;
eofflag = 0;
- vn_lock(vp, LK_SHARED | LK_RETRY);
vp_locked = 1;
if (cookies) {
free((caddr_t)cookies, M_TEMP);
cookies = NULL;
}
+ vn_lock(vp, LK_SHARED | LK_RETRY);
error = VOP_READDIR(vp, &io, cred, &eofflag, &ncookies, &cookies);
off = (u_quad_t)io.uio_offset;
getret = VOP_GETATTR(vp, &at, cred);
More information about the svn-src-all
mailing list