svn commit: r297152 - stable/10/share/man/man9

[Bryan Drewery]

Author: bdrewery
Date: Mon Mar 21 17:51:15 2016
New Revision: 297152
URL: https://svnweb.freebsd.org/changeset/base/297152

Log:
  MFC r296819:
  
Reword SX_NOADAPTIVE description to be clear that adaptive is default.

Modified:
  stable/10/share/man/man9/sx.9
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/share/man/man9/sx.9
==
--- stable/10/share/man/man9/sx.9   Mon Mar 21 15:06:50 2016
(r297151)
+++ stable/10/share/man/man9/sx.9   Mon Mar 21 17:51:15 2016
(r297152)
@@ -26,7 +26,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd November 16, 2011
+.Dd March 13, 2016
 .Dt SX 9
 .Os
 .Sh NAME
@@ -124,12 +124,10 @@ specifies a set of optional flags to alt
 It contains one or more of the following flags:
 .Bl -tag -width SX_NOADAPTIVE
 .It Dv SX_NOADAPTIVE
-If the kernel is not compiled with
-.Cd "options NO_ADAPTIVE_SX" ,
-then lock operations for
-.Fa sx
-will spin instead of sleeping while an exclusive lock holder is executing on
-another CPU.
+Disable adaptive spinning, rather than sleeping, for lock operations
+while an exclusive lock holder is executing on another CPU.
+Adaptive spinning is the default unless the kernel is compiled with
+.Cd "options NO_ADAPTIVE_SX" .
 .It Dv SX_DUPOK
 Witness should not log messages about duplicate locks being acquired.
 .It Dv SX_NOWITNESS
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

svn commit: r297144 - stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Alexander Motin]

Author: mav
Date: Mon Mar 21 07:36:02 2016
New Revision: 297144
URL: https://svnweb.freebsd.org/changeset/base/297144

Log:
  MFC r277629 (by will):
  When creating or updating a node, use vfs_timestamp() for "now" instead
  of gethrestime(), to allow the administrator to decide the appropriate
  timestamp precision instead of always using nanosecond precision.

Modified:
  stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c
==
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c
Mon Mar 21 07:16:30 2016(r297143)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c
Mon Mar 21 07:36:02 2016(r297144)
@@ -795,7 +795,7 @@ zfs_mknode(znode_t *dzp, vattr_t *vap, d
gen = vap->va_nblocks;  /* ditto */
} else {
obj = 0;
-   gethrestime();
+   vfs_timestamp();
gen = dmu_tx_get_txg(tx);
}
 
@@ -1437,7 +1437,7 @@ zfs_tstamp_update_setup(znode_t *zp, uin
 {
timestruc_t now;
 
-   gethrestime();
+   vfs_timestamp();
 
if (have_tx) {  /* will sa_bulk_update happen really soon? */
zp->z_atime_dirty = 0;
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"