svn commit: r220928 - head/sys/fs/nfsclient
Rick Macklem
rmacklem at FreeBSD.org
Thu Apr 21 19:56:07 UTC 2011
Author: rmacklem
Date: Thu Apr 21 19:56:06 2011
New Revision: 220928
URL: http://svn.freebsd.org/changeset/base/220928
Log:
Remove the nm_mtx mutex locking from the test for
nm_maxfilesize. This value rarely, if ever, changes
and the nm_mtx mutex is locked/unlocked earlier in
the function, which should be sufficient to avoid
getting a stale cached value for it. There is a
discussion w.r.t. what these tests should be, but
I've left them basically the same as the regular
NFS client for now.
Suggested by: pjd
MFC after: 2 weeks
Modified:
head/sys/fs/nfsclient/nfs_clbio.c
Modified: head/sys/fs/nfsclient/nfs_clbio.c
==============================================================================
--- head/sys/fs/nfsclient/nfs_clbio.c Thu Apr 21 16:40:34 2011 (r220927)
+++ head/sys/fs/nfsclient/nfs_clbio.c Thu Apr 21 19:56:06 2011 (r220928)
@@ -946,12 +946,8 @@ flush_and_restart:
if (uio->uio_offset < 0)
return (EINVAL);
tmp_off = uio->uio_offset + uio->uio_resid;
- mtx_lock(&nmp->nm_mtx);
- if (tmp_off > nmp->nm_maxfilesize || tmp_off < uio->uio_offset) {
- mtx_unlock(&nmp->nm_mtx);
+ if (tmp_off > nmp->nm_maxfilesize || tmp_off < uio->uio_offset)
return (EFBIG);
- }
- mtx_unlock(&nmp->nm_mtx);
if (uio->uio_resid == 0)
return (0);
More information about the svn-src-all
mailing list