xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bcache: Do bkey_put() in btree_split() error path

Browse Source 
This error path shouldn't have been hit in practice.. and we've got reworked
reserve code coming soon so that it shouldn't _ever_ be bit... but if we've got
code for this error path it should be correct.

Signed-off-by: Kent Overstreet <kmo@daterainc.com>
This commit is contained in:
Kent Overstreet
2013-12-16 16:38:49 -08:00
parent 78365411b3
commit 5f5837d2d6
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/md/bcache/btree.c
View File

@@ -2191,18 +2191,21 @@ static int btree_split(struct btree *b, struct btree_op *op,
return 0; return 0;
err_free2: err_free2:
bkey_put(b->c, &n2->key);
btree_node_free(n2); btree_node_free(n2);
rw_unlock(true, n2); rw_unlock(true, n2);
err_free1: err_free1:
bkey_put(b->c, &n1->key);
btree_node_free(n1); btree_node_free(n1);
rw_unlock(true, n1); rw_unlock(true, n1);
err: err:
WARN(1, "bcache: btree split failed");
if (n3 == ERR_PTR(-EAGAIN) || if (n3 == ERR_PTR(-EAGAIN) ||
n2 == ERR_PTR(-EAGAIN) || n2 == ERR_PTR(-EAGAIN) ||
n1 == ERR_PTR(-EAGAIN)) n1 == ERR_PTR(-EAGAIN))
return -EAGAIN; return -EAGAIN;
pr_warn("couldn't split");
return -ENOMEM; return -ENOMEM;
} }