Print this page
6328 Fix cstyle errors in zfs codebase (fix studio)
6328 Fix cstyle errors in zfs codebase
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Reviewed by: Alex Reece <alex@delphix.com>
Reviewed by: Richard Elling <Richard.Elling@RichardElling.com>
Reviewed by: Jorgen Lundman <lundman@lundman.net>
Approved by: Robert Mustacchi <rm@joyent.com>

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/fs/zfs/space_reftree.c
          +++ new/usr/src/uts/common/fs/zfs/space_reftree.c
↓ open down ↓ 109 lines elided ↑ open up ↑
 110  110  }
 111  111  
 112  112  /*
 113  113   * Convert (or add) a range tree into a reference tree.
 114  114   */
 115  115  void
 116  116  space_reftree_add_map(avl_tree_t *t, range_tree_t *rt, int64_t refcnt)
 117  117  {
 118  118          range_seg_t *rs;
 119  119  
      120 +        ASSERT(MUTEX_HELD(rt->rt_lock));
      121 +
 120  122          for (rs = avl_first(&rt->rt_root); rs; rs = AVL_NEXT(&rt->rt_root, rs))
 121  123                  space_reftree_add_seg(t, rs->rs_start, rs->rs_end, refcnt);
 122  124  }
 123  125  
 124  126  /*
 125  127   * Convert a reference tree into a range tree.  The range tree will contain
 126  128   * all members of the reference tree for which refcnt >= minref.
 127  129   */
 128  130  void
 129  131  space_reftree_generate_map(avl_tree_t *t, range_tree_t *rt, int64_t minref)
 130  132  {
 131  133          uint64_t start = -1ULL;
 132  134          int64_t refcnt = 0;
 133  135          space_ref_t *sr;
 134  136  
      137 +        ASSERT(MUTEX_HELD(rt->rt_lock));
      138 +
 135  139          range_tree_vacate(rt, NULL, NULL);
 136  140  
 137  141          for (sr = avl_first(t); sr != NULL; sr = AVL_NEXT(t, sr)) {
 138  142                  refcnt += sr->sr_refcnt;
 139  143                  if (refcnt >= minref) {
 140  144                          if (start == -1ULL) {
 141  145                                  start = sr->sr_offset;
 142  146                          }
 143  147                  } else {
 144  148                          if (start != -1ULL) {
↓ open down ↓ 11 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX