Commit 861c0981 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'jfs-6.8-rc3' of github.com:kleikamp/linux-shaggy

Pull jfs fix from David Kleikamp:
 "Revert a bad sanity check"

* tag 'jfs-6.8-rc3' of github.com:kleikamp/linux-shaggy:
  Revert "jfs: fix shift-out-of-bounds in dbJoin"
parents 9b7bd05b e42e29cc
...@@ -2763,9 +2763,7 @@ static int dbBackSplit(dmtree_t *tp, int leafno, bool is_ctl) ...@@ -2763,9 +2763,7 @@ static int dbBackSplit(dmtree_t *tp, int leafno, bool is_ctl)
* leafno - the number of the leaf to be updated. * leafno - the number of the leaf to be updated.
* newval - the new value for the leaf. * newval - the new value for the leaf.
* *
* RETURN VALUES: * RETURN VALUES: none
* 0 - success
* -EIO - i/o error
*/ */
static int dbJoin(dmtree_t *tp, int leafno, int newval, bool is_ctl) static int dbJoin(dmtree_t *tp, int leafno, int newval, bool is_ctl)
{ {
...@@ -2792,10 +2790,6 @@ static int dbJoin(dmtree_t *tp, int leafno, int newval, bool is_ctl) ...@@ -2792,10 +2790,6 @@ static int dbJoin(dmtree_t *tp, int leafno, int newval, bool is_ctl)
* get the buddy size (number of words covered) of * get the buddy size (number of words covered) of
* the new value. * the new value.
*/ */
if ((newval - tp->dmt_budmin) > BUDMIN)
return -EIO;
budsz = BUDSIZE(newval, tp->dmt_budmin); budsz = BUDSIZE(newval, tp->dmt_budmin);
/* try to join. /* try to join.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment