NEX-10069 ZFS_READONLY is a little too strict (fix test lint)
NEX-9553 Move ss_fill gap logic from scan algorithm into range_tree.c
Reviewed by: Roman Strashkin <roman.strashkin@nexenta.com>
Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com>
NEX-9562 Attaching a vdev while resilver/scrub is running causes panic.
Reviewed by: Roman Strashkin <roman.strashkin@nexenta.com>
Reviewed by: Sanjay Nadkarni <sanjay.nadkarni@nexenta.com>
NEX-6088 ZFS scrub/resilver take excessively long due to issuing lots of random IO
Reviewed by: Roman Strashkin <roman.strashkin@nexenta.com>
Reviewed by: Sanjay Nadkarni <sanjay.nadkarni@nexenta.com>
NEX-3508 CLONE - Port NEX-2946 Add UNMAP/TRIM functionality to ZFS and illumos
Reviewed by: Josef Sipek <josef.sipek@nexenta.com>
Reviewed by: Alek Pinchuk <alek.pinchuk@nexenta.com>
Conflicts:
    usr/src/uts/common/io/scsi/targets/sd.c
    usr/src/uts/common/sys/scsi/targets/sddef.h

@@ -22,11 +22,11 @@
  * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
 /*
- * Copyright (c) 2013, 2015 by Delphix. All rights reserved.
+ * Copyright (c) 2013, 2014 by Delphix. All rights reserved.
  */
 
 #ifndef _SYS_RANGE_TREE_H
 #define _SYS_RANGE_TREE_H
 

@@ -39,33 +39,34 @@
 
 #define RANGE_TREE_HISTOGRAM_SIZE       64
 
 typedef struct range_tree_ops range_tree_ops_t;
 
-/*
- * Note: the range_tree may not be accessed concurrently; consumers
- * must provide external locking if required.
- */
 typedef struct range_tree {
         avl_tree_t      rt_root;        /* offset-ordered segment AVL tree */
         uint64_t        rt_space;       /* sum of all segments in the map */
         range_tree_ops_t *rt_ops;
         void            *rt_arg;
 
+        uint64_t        rt_gap; /* allowable inter-seg gap */
+        kmem_cache_t    *rt_seg_cache;
+
         /*
          * The rt_histogram maintains a histogram of ranges. Each bucket,
          * rt_histogram[i], contains the number of ranges whose size is:
          * 2^i <= size of range in bytes < 2^(i+1)
          */
         uint64_t        rt_histogram[RANGE_TREE_HISTOGRAM_SIZE];
+        kmutex_t        *rt_lock;       /* pointer to lock that protects map */
 } range_tree_t;
 
 typedef struct range_seg {
         avl_node_t      rs_node;        /* AVL node */
         avl_node_t      rs_pp_node;     /* AVL picker-private node */
         uint64_t        rs_start;       /* starting offset of this segment */
         uint64_t        rs_end;         /* ending offset (non-inclusive) */
+        uint64_t        rs_fill;        /* actual fill if gap mode is on */
 } range_seg_t;
 
 struct range_tree_ops {
         void    (*rtop_create)(range_tree_t *rt, void *arg);
         void    (*rtop_destroy)(range_tree_t *rt, void *arg);

@@ -76,24 +77,34 @@
 
 typedef void range_tree_func_t(void *arg, uint64_t start, uint64_t size);
 
 void range_tree_init(void);
 void range_tree_fini(void);
-range_tree_t *range_tree_create(range_tree_ops_t *ops, void *arg);
+range_tree_t *range_tree_create(range_tree_ops_t *ops, void *arg, kmutex_t *lp);
 void range_tree_destroy(range_tree_t *rt);
 boolean_t range_tree_contains(range_tree_t *rt, uint64_t start, uint64_t size);
+void *range_tree_find(range_tree_t *rt, uint64_t start, uint64_t size);
+uint64_t range_tree_find_gap(range_tree_t *rt, uint64_t start, uint64_t size);
 uint64_t range_tree_space(range_tree_t *rt);
 void range_tree_verify(range_tree_t *rt, uint64_t start, uint64_t size);
 void range_tree_swap(range_tree_t **rtsrc, range_tree_t **rtdst);
 void range_tree_stat_verify(range_tree_t *rt);
+void range_tree_set_gap(range_tree_t *rt, uint64_t gap);
+void range_tree_set_lock(range_tree_t *rt, kmutex_t *lp);
 
 void range_tree_add(void *arg, uint64_t start, uint64_t size);
+void range_tree_add_fill(void *arg, uint64_t start, uint64_t size,
+    uint64_t fill);
 void range_tree_remove(void *arg, uint64_t start, uint64_t size);
+void range_tree_remove_overlap(void *arg, uint64_t start, uint64_t size);
+void range_tree_remove_fill(void *arg, uint64_t start, uint64_t size,
+    uint64_t fill, uint64_t fill_left);
 void range_tree_clear(range_tree_t *rt, uint64_t start, uint64_t size);
 
 void range_tree_vacate(range_tree_t *rt, range_tree_func_t *func, void *arg);
 void range_tree_walk(range_tree_t *rt, range_tree_func_t *func, void *arg);
+range_seg_t *range_tree_first(range_tree_t *rt);
 
 #ifdef  __cplusplus
 }
 #endif