diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-23 22:23:52 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-23 22:23:52 (GMT) |
| commit | 35df017c4d5571ee6f3061964d1445aae250219c (patch) | |
| tree | 90023fc44a9660a7e506c1ba7b7f44f8af5a141e /drivers/md/persistent-data/dm-btree.c | |
| parent | ea1ee5ff1b500ccdc64782ecef13d276afb08f14 (diff) | |
| parent | 3201ac452e84a8a368197d648c9b7011e061804a (diff) | |
| download | linux-35df017c4d5571ee6f3061964d1445aae250219c.tar.xz | |
Merge tag 'dm-4.3-fixes-4' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm
Pull device mapper fixes from Mike Snitzer:
"Three stable fixes (two in btree code used by DM thinp and one to
properly store flags in DM cache metadata's superblock)"
* tag 'dm-4.3-fixes-4' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
dm cache: the CLEAN_SHUTDOWN flag was not being set
dm btree: fix leak of bufio-backed block in btree_split_beneath error path
dm btree remove: fix a bug when rebalancing nodes after removal
Diffstat (limited to 'drivers/md/persistent-data/dm-btree.c')
| -rw-r--r-- | drivers/md/persistent-data/dm-btree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/persistent-data/dm-btree.c b/drivers/md/persistent-data/dm-btree.c index b6cec25..0e09aef 100644 --- a/drivers/md/persistent-data/dm-btree.c +++ b/drivers/md/persistent-data/dm-btree.c @@ -523,7 +523,7 @@ static int btree_split_beneath(struct shadow_spine *s, uint64_t key) r = new_block(s->info, &right); if (r < 0) { - /* FIXME: put left */ + unlock_block(s->info, left); return r; } |