svn commit: r286764 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Alexander Motin]

Author: mav
Date: Fri Aug 14 09:33:46 2015
New Revision: 286764
URL: https://svnweb.freebsd.org/changeset/base/286764

Log:
  MFV r285025: 6033 arc_adjust() should search MFU lists for oldest buffer
  when adjusting MFU size.
  
  illumos/illumos-gate at 31c46cf23cd1cf4d66390a983dc5072d7d299ba2
  
  https://www.illumos.org/issues/6033
    When we're looking for the list containing oldest buffer we never
    actually look at the MFU lists even when we try to evict from MFU.
    looks like a copy paste error, the fix is here:
  
  Reviewed by: Saso Kiselkov <saso.kiselkov at nexenta.com>
  Reviewed by: Xin Li <delphij at delphij.net>
  Reviewed by: Prakash Surya <me at prakashsurya.com>
  Approved by: Matthew Ahrens <mahrens at delphix.com>
  Author: Alek Pinchuk <alek at nexenta.com>
  Obtained from:  illumos

Modified:
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
Directory Properties:
  head/sys/cddl/contrib/opensolaris/   (props changed)

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c	Fri Aug 14 09:31:07 2015	(r286763)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c	Fri Aug 14 09:33:46 2015	(r286764)
@@ -23,7 +23,7 @@
  * Copyright (c) 2012, Joyent, Inc. All rights reserved.
  * Copyright (c) 2011, 2014 by Delphix. All rights reserved.
  * Copyright (c) 2014 by Saso Kiselkov. All rights reserved.
- * Copyright 2014 Nexenta Systems, Inc.  All rights reserved.
+ * Copyright 2015 Nexenta Systems, Inc.  All rights reserved.
  */
 
 /*
@@ -3115,7 +3115,7 @@ arc_adjust(void)
 	 */
 	target = arc_size - arc_c;
 
-	if (arc_adjust_type(arc_mru) == ARC_BUFC_METADATA &&
+	if (arc_adjust_type(arc_mfu) == ARC_BUFC_METADATA &&
 	    arc_meta_used > arc_meta_min) {
 		bytes = arc_adjust_impl(arc_mfu, 0, target, ARC_BUFC_METADATA);
 		total_evicted += bytes;