mirror of
https://github.com/torvalds/linux.git
synced 2024-11-24 21:21:41 +00:00
Revert "jfs: fix shift-out-of-bounds in dbJoin"
This reverts commit cca974daeb
.
The added sanity check is incorrect. BUDMIN is not the wrong value and
is too small.
Signed-off-by: Dave Kleikamp <dave.kleikamp@oracle.com>
This commit is contained in:
parent
41bccc98fb
commit
e42e29cc44
@ -2763,9 +2763,7 @@ static int dbBackSplit(dmtree_t *tp, int leafno, bool is_ctl)
|
||||
* leafno - the number of the leaf to be updated.
|
||||
* newval - the new value for the leaf.
|
||||
*
|
||||
* RETURN VALUES:
|
||||
* 0 - success
|
||||
* -EIO - i/o error
|
||||
* RETURN VALUES: none
|
||||
*/
|
||||
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
|
||||
* the new value.
|
||||
*/
|
||||
|
||||
if ((newval - tp->dmt_budmin) > BUDMIN)
|
||||
return -EIO;
|
||||
|
||||
budsz = BUDSIZE(newval, tp->dmt_budmin);
|
||||
|
||||
/* try to join.
|
||||
|
Loading…
Reference in New Issue
Block a user