svn commit: r316037 - in head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs: . sys

[Josh Paetzel]

Author: jpaetzel
Date: Mon Mar 27 17:27:46 2017
New Revision: 316037
URL: https://svnweb.freebsd.org/changeset/base/316037

Log:
  MFV: 315989
  
  7603 xuio_stat_wbuf_* should be declared (void)
  
  illumos/illumos-gate at 99aa8b55058e512798eafbd71f72f916bdc10181
  https://github.com/illumos/illumos-gate/commit/99aa8b55058e512798eafbd71f72f916bdc10181
  
  https://www.illumos.org/issues/7603
  
    The funcs are declared k&r style, where the args are not specified:
  
    void xuio_stat_wbuf_copied();
    They should be declared to take no arguments:
  
    void xuio_stat_wbuf_copied(void);
    Need to change both .c and .h.
  
  Author: Prashanth Sreenivasa <pks at delphix.com>
  Reviewed by: Matthew Ahrens <mahrens at delphix.com>
  Reviewed by: Paul Dagnelie <pcd at delphix.com>
  Reviewed by: Robert Mustacchi <rm at joyent.com>
  Approved by: Richard Lowe <richlowe at richlowe.net>

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

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c	Mon Mar 27 17:24:40 2017	(r316036)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c	Mon Mar 27 17:27:46 2017	(r316037)
@@ -1124,13 +1124,13 @@ xuio_stat_fini(void)
 }
 
 void
-xuio_stat_wbuf_copied()
+xuio_stat_wbuf_copied(void)
 {
 	XUIOSTAT_BUMP(xuiostat_wbuf_copied);
 }
 
 void
-xuio_stat_wbuf_nocopy()
+xuio_stat_wbuf_nocopy(void)
 {
 	XUIOSTAT_BUMP(xuiostat_wbuf_nocopy);
 }

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h	Mon Mar 27 17:24:40 2017	(r316036)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h	Mon Mar 27 17:27:46 2017	(r316037)
@@ -762,8 +762,8 @@ int dmu_xuio_add(struct xuio *uio, struc
 int dmu_xuio_cnt(struct xuio *uio);
 struct arc_buf *dmu_xuio_arcbuf(struct xuio *uio, int i);
 void dmu_xuio_clear(struct xuio *uio, int i);
-void xuio_stat_wbuf_copied();
-void xuio_stat_wbuf_nocopy();
+void xuio_stat_wbuf_copied(void);
+void xuio_stat_wbuf_nocopy(void);
 
 extern boolean_t zfs_prefetch_disable;
 extern int zfs_max_recordsize;