summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@gmail.com>2016-08-11 08:08:55 -0800
committerKent Overstreet <kent.overstreet@gmail.com>2016-10-07 12:36:53 -0800
commit16b1493df0d926317268edde9de2ad195582e9fc (patch)
treef9e2ec7018905dcffde013906d3d84673d47323f
parent5ed5fdaf36b8e7938902d468920b35926fbb956c (diff)
bcache: disable compressed_size disk space accounting until copygc issue fixed
-rw-r--r--drivers/md/bcache/buckets.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/drivers/md/bcache/buckets.c b/drivers/md/bcache/buckets.c
index d7c37223bcfd..c742e520b4a5 100644
--- a/drivers/md/bcache/buckets.c
+++ b/drivers/md/bcache/buckets.c
@@ -357,6 +357,9 @@ do { \
} \
} while (0)
+#if 0
+/* Reverting this until the copygc + compression issue is fixed: */
+
static unsigned __disk_sectors(struct bch_extent_crc64 crc, unsigned sectors)
{
return crc.compression_type
@@ -370,6 +373,17 @@ static unsigned __compressed_sectors(struct bch_extent_crc64 crc, unsigned secto
? min_t(unsigned, crc.compressed_size, sectors)
: sectors;
}
+#else
+static unsigned __disk_sectors(struct bch_extent_crc64 crc, unsigned sectors)
+{
+ return sectors;
+}
+
+static unsigned __compressed_sectors(struct bch_extent_crc64 crc, unsigned sectors)
+{
+ return sectors;
+}
+#endif
/*
* Checking against gc's position has to be done here, inside the cmpxchg()