svn commit: r338865 - in vendor-sys/illumos/dist/uts/common/fs/zfs: . sys

[Alexander Motin]

Author: mav
Date: Fri Sep 21 20:36:26 2018
New Revision: 338865
URL: https://svnweb.freebsd.org/changeset/base/338865

Log:
  9626 move 'static xuio_stats_t xuio_stats' to file where it use
  
  illumos/illumos-gate at 857c96d257470e097e846ab8886580991b329c32
  
  Reviewed by: Yuri Pankov <yuripv at yuripv.net>
  Reviewed by: Matthew Ahrens <mahrens at delphix.com>
  Approved by: Dan McDonald <danmcd at joyent.com>
  Author:     Igor Kozhukhov <igor at dilos.org>

Modified:
  vendor-sys/illumos/dist/uts/common/fs/zfs/dmu.c
  vendor-sys/illumos/dist/uts/common/fs/zfs/sys/dmu_impl.h

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/dmu.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/dmu.c	Fri Sep 21 20:34:26 2018	(r338864)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/dmu.c	Fri Sep 21 20:36:26 2018	(r338865)
@@ -20,11 +20,14 @@
  */
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ */
+/*
+ * Copyright (c) 2013 by Saso Kiselkov. All rights reserved.
+ * Copyright (c) 2013, Joyent, Inc. All rights reserved.
+ * Copyright 2016 Nexenta Systems, Inc. All rights reserved.
  * Copyright (c) 2011, 2017 by Delphix. All rights reserved.
+ * Copyright (c) 2018 DilOS
  */
-/* Copyright (c) 2013 by Saso Kiselkov. All rights reserved. */
-/* Copyright (c) 2013, Joyent, Inc. All rights reserved. */
-/* Copyright 2016 Nexenta Systems, Inc. All rights reserved. */
 
 #include <sys/dmu.h>
 #include <sys/dmu_impl.h>
@@ -51,6 +54,19 @@
 #include <sys/vmsystm.h>
 #include <sys/zfs_znode.h>
 #endif
+
+static xuio_stats_t xuio_stats = {
+	{ "onloan_read_buf",	KSTAT_DATA_UINT64 },
+	{ "onloan_write_buf",	KSTAT_DATA_UINT64 },
+	{ "read_buf_copied",	KSTAT_DATA_UINT64 },
+	{ "read_buf_nocopy",	KSTAT_DATA_UINT64 },
+	{ "write_buf_copied",	KSTAT_DATA_UINT64 },
+	{ "write_buf_nocopy",	KSTAT_DATA_UINT64 }
+};
+
+#define	XUIOSTAT_INCR(stat, val)	\
+	atomic_add_64(&xuio_stats.stat.value.ui64, (val))
+#define	XUIOSTAT_BUMP(stat)	XUIOSTAT_INCR(stat, 1)
 
 /*
  * Enable/disable nopwrite feature.

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/sys/dmu_impl.h
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/sys/dmu_impl.h	Fri Sep 21 20:34:26 2018	(r338864)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/sys/dmu_impl.h	Fri Sep 21 20:36:26 2018	(r338865)
@@ -25,6 +25,7 @@
 /*
  * Copyright (c) 2012, Joyent, Inc. All rights reserved.
  * Copyright (c) 2013, 2015 by Delphix. All rights reserved.
+ * Copyright (c) 2018 DilOS
  */
 
 #ifndef _SYS_DMU_IMPL_H
@@ -253,19 +254,6 @@ typedef struct xuio_stats {
 	kstat_named_t xuiostat_wbuf_copied;
 	kstat_named_t xuiostat_wbuf_nocopy;
 } xuio_stats_t;
-
-static xuio_stats_t xuio_stats = {
-	{ "onloan_read_buf",	KSTAT_DATA_UINT64 },
-	{ "onloan_write_buf",	KSTAT_DATA_UINT64 },
-	{ "read_buf_copied",	KSTAT_DATA_UINT64 },
-	{ "read_buf_nocopy",	KSTAT_DATA_UINT64 },
-	{ "write_buf_copied",	KSTAT_DATA_UINT64 },
-	{ "write_buf_nocopy",	KSTAT_DATA_UINT64 }
-};
-
-#define	XUIOSTAT_INCR(stat, val)	\
-	atomic_add_64(&xuio_stats.stat.value.ui64, (val))
-#define	XUIOSTAT_BUMP(stat)	XUIOSTAT_INCR(stat, 1)
 
 /*
  * The list of data whose inclusion in a send stream can be pending from