Author: avg
Date: Tue Jul 12 12:03:00 2016
New Revision: 302661
URL: https://svnweb.freebsd.org/changeset/base/302661

Log:
  7082 bptree_iterate() passes wrong args to zfs_dbgmsg()
  
  illumos/illumos-gate@10e67aa0db0823d5464aafdd681f3c966155c68e
  
https://github.com/illumos/illumos-gate/commit/10e67aa0db0823d5464aafdd681f3c966155c68e
  
  https://www.illumos.org/issues/7082
    upstream
    DLPX-40542 bptree_iterate() passes wrong args to zfs_dbgmsg()
  
  Reviewed by: Dan Kimmel <dan.kim...@delphix.com>
  Reviewed by: George Wilson <george.wil...@delphix.com>
  Reviewed by: Igor Kozhukhov <ikozhuk...@gmail.com>
  Approved by: Dan McDonald <dan...@omniti.com>
  Author: Matthew Ahrens <mahr...@delphix.com>

Modified:
  vendor-sys/illumos/dist/uts/common/fs/zfs/bptree.c

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/bptree.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/bptree.c  Tue Jul 12 12:01:54 
2016        (r302660)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/bptree.c  Tue Jul 12 12:03:00 
2016        (r302661)
@@ -20,7 +20,7 @@
  */
 
 /*
- * Copyright (c) 2011, 2014 by Delphix. All rights reserved.
+ * Copyright (c) 2011, 2015 by Delphix. All rights reserved.
  * Copyright (c) 2014 Integros [integros.com]
  */
 
@@ -220,9 +220,10 @@ bptree_iterate(objset_t *os, uint64_t ob
 
                if (zfs_free_leak_on_eio)
                        flags |= TRAVERSE_HARD;
-               zfs_dbgmsg("bptree index %d: traversing from min_txg=%lld "
+               zfs_dbgmsg("bptree index %lld: traversing from min_txg=%lld "
                    "bookmark %lld/%lld/%lld/%lld",
-                   i, (longlong_t)bte.be_birth_txg,
+                   (longlong_t)i,
+                   (longlong_t)bte.be_birth_txg,
                    (longlong_t)bte.be_zb.zb_objset,
                    (longlong_t)bte.be_zb.zb_object,
                    (longlong_t)bte.be_zb.zb_level,
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to