diff options
author | Nicholas Swenson <nks@daterainc.com> | 2013-11-07 17:53:19 -0800 |
---|---|---|
committer | Kent Overstreet <kmo@daterainc.com> | 2013-12-16 14:22:58 -0800 |
commit | 981aa8c091e164ea51dd1e81b71a1f3852bbcceb (patch) | |
tree | 63b14b1df54db25daa2ce46c8f42b5cff0ab1b89 /drivers/md/bcache/bcache.h | |
parent | bee63f40cb5f5e8ab2abfbc85acde99cc0acd4b5 (diff) | |
download | op-kernel-dev-981aa8c091e164ea51dd1e81b71a1f3852bbcceb.zip op-kernel-dev-981aa8c091e164ea51dd1e81b71a1f3852bbcceb.tar.gz |
bcache: bugfix - moving_gc now moves only correct buckets
Removed gc_move_threshold because picking buckets only by
threshold could lead moving extra buckets (ei. if there are
buckets at the threshold that aren't supposed to be moved
do to space considerations).
This is replaced by a GC_MOVE bit in the gc_mark bitmask.
Now only marked buckets get moved.
Signed-off-by: Nicholas Swenson <nks@daterainc.com>
Signed-off-by: Kent Overstreet <kmo@daterainc.com>
Diffstat (limited to 'drivers/md/bcache/bcache.h')
-rw-r--r-- | drivers/md/bcache/bcache.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/md/bcache/bcache.h b/drivers/md/bcache/bcache.h index 4beb55a..a7b1a76 100644 --- a/drivers/md/bcache/bcache.h +++ b/drivers/md/bcache/bcache.h @@ -197,7 +197,7 @@ struct bucket { uint8_t disk_gen; uint8_t last_gc; /* Most out of date gen in the btree */ uint8_t gc_gen; - uint16_t gc_mark; + uint16_t gc_mark; /* Bitfield used by GC. See below for field */ }; /* @@ -209,7 +209,8 @@ BITMASK(GC_MARK, struct bucket, gc_mark, 0, 2); #define GC_MARK_RECLAIMABLE 0 #define GC_MARK_DIRTY 1 #define GC_MARK_METADATA 2 -BITMASK(GC_SECTORS_USED, struct bucket, gc_mark, 2, 14); +BITMASK(GC_SECTORS_USED, struct bucket, gc_mark, 2, 13); +BITMASK(GC_MOVE, struct bucket, gc_mark, 15, 1); #include "journal.h" #include "stats.h" @@ -445,7 +446,6 @@ struct cache { * call prio_write() to keep gens from wrapping. */ uint8_t need_save_prio; - unsigned gc_move_threshold; /* * If nonzero, we know we aren't going to find any buckets to invalidate |