summaryrefslogtreecommitdiff
path: root/fs/bcachefs/alloc.c
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@gmail.com>2018-07-23 09:13:07 -0400
committerKent Overstreet <kent.overstreet@gmail.com>2018-08-12 18:17:51 -0400
commit3637eb609f3fd1dbdc1d35aa4f85d3bf3e96fd09 (patch)
treeb6ae7e350e7cab4c0276aa5fbcfb9d8614a63af9 /fs/bcachefs/alloc.c
parent19e9745c69d66f0d8198d101a8dce0068387ad98 (diff)
bcachefs: fix bch2_val_to_text()
was returning wrong value
Diffstat (limited to 'fs/bcachefs/alloc.c')
-rw-r--r--fs/bcachefs/alloc.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/fs/bcachefs/alloc.c b/fs/bcachefs/alloc.c
index 264f7c5543e2..3f64ad84fdc0 100644
--- a/fs/bcachefs/alloc.c
+++ b/fs/bcachefs/alloc.c
@@ -154,8 +154,8 @@ const char *bch2_alloc_invalid(const struct bch_fs *c, struct bkey_s_c k)
return NULL;
}
-void bch2_alloc_to_text(struct bch_fs *c, char *buf,
- size_t size, struct bkey_s_c k)
+int bch2_alloc_to_text(struct bch_fs *c, char *buf,
+ size_t size, struct bkey_s_c k)
{
buf[0] = '\0';
@@ -163,6 +163,8 @@ void bch2_alloc_to_text(struct bch_fs *c, char *buf,
case BCH_ALLOC:
break;
}
+
+ return 0;
}
static inline unsigned get_alloc_field(const u8 **p, unsigned bytes)
@@ -2067,6 +2069,8 @@ not_enough:
* invalidated on disk:
*/
if (invalidating_data) {
+ BUG();
+ pr_info("holding writes");
pr_debug("invalidating existing data");
set_bit(BCH_FS_HOLD_BTREE_WRITES, &c->flags);
} else {