Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Kernel bump from 4.1.3-rt to 4.1.7-rt.
[kvmfornfv.git]
/
kernel
/
drivers
/
md
/
persistent-data
/
dm-btree-remove.c
diff --git
a/kernel/drivers/md/persistent-data/dm-btree-remove.c
b/kernel/drivers/md/persistent-data/dm-btree-remove.c
index
b88757c
..
a03178e
100644
(file)
--- a/
kernel/drivers/md/persistent-data/dm-btree-remove.c
+++ b/
kernel/drivers/md/persistent-data/dm-btree-remove.c
@@
-309,8
+309,8
@@
static void redistribute3(struct dm_btree_info *info, struct btree_node *parent,
if (s < 0 && nr_center < -s) {
/* not enough in central node */
if (s < 0 && nr_center < -s) {
/* not enough in central node */
- shift(left, center, nr_center);
- s
= nr_center - target
;
+ shift(left, center,
-
nr_center);
+ s
+= nr_center
;
shift(left, right, s);
nr_right += s;
} else
shift(left, right, s);
nr_right += s;
} else
@@
-323,7
+323,7
@@
static void redistribute3(struct dm_btree_info *info, struct btree_node *parent,
if (s > 0 && nr_center < s) {
/* not enough in central node */
shift(center, right, nr_center);
if (s > 0 && nr_center < s) {
/* not enough in central node */
shift(center, right, nr_center);
- s
= target -
nr_center;
+ s
-=
nr_center;
shift(left, right, s);
nr_left -= s;
} else
shift(left, right, s);
nr_left -= s;
} else