diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2016-10-05 22:48:09 -0800 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2016-10-07 12:37:19 -0800 |
| commit | 52812f9c16cd5b7017bf52cbf5c6c73127f2574e (patch) | |
| tree | d75ce926f56fcafc1f7d275444846b8084c165e8 | |
| parent | 9097e49827b0f9924e909341e8ab37f122ee65f9 (diff) | |
bcache: add a journal error check to __bch_btree_reserve_get()
| -rw-r--r-- | drivers/md/bcache/btree_update.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/md/bcache/btree_update.c b/drivers/md/bcache/btree_update.c index ad7e3d9790d4..bfbc2964394f 100644 --- a/drivers/md/bcache/btree_update.c +++ b/drivers/md/bcache/btree_update.c @@ -503,6 +503,14 @@ static struct btree_reserve *__bch_btree_reserve_get(struct cache_set *c, if (!check_enospc) flags |= BCH_DISK_RESERVATION_NOFAIL; + /* + * This check isn't necessary for correctness - it's just to potentially + * prevent us from doing a lot of work that'll end up being wasted: + */ + ret = bch_journal_error(&c->journal); + if (ret) + return ERR_PTR(ret); + if (bch_disk_reservation_get(c, &disk_res, sectors, flags)) return ERR_PTR(-ENOSPC); |