Skip to content

Commit 861c098

Browse files
committed
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"
2 parents 9b7bd05 + e42e29c commit 861c098

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

fs/jfs/jfs_dmap.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2763,9 +2763,7 @@ static int dbBackSplit(dmtree_t *tp, int leafno, bool is_ctl)
27632763
* leafno - the number of the leaf to be updated.
27642764
* newval - the new value for the leaf.
27652765
*
2766-
* RETURN VALUES:
2767-
* 0 - success
2768-
* -EIO - i/o error
2766+
* RETURN VALUES: none
27692767
*/
27702768
static int dbJoin(dmtree_t *tp, int leafno, int newval, bool is_ctl)
27712769
{
@@ -2792,10 +2790,6 @@ static int dbJoin(dmtree_t *tp, int leafno, int newval, bool is_ctl)
27922790
* get the buddy size (number of words covered) of
27932791
* the new value.
27942792
*/
2795-
2796-
if ((newval - tp->dmt_budmin) > BUDMIN)
2797-
return -EIO;
2798-
27992793
budsz = BUDSIZE(newval, tp->dmt_budmin);
28002794

28012795
/* try to join.

0 commit comments

Comments
 (0)