From: Dave Kleikamp <dave.kleikamp@xxxxxxxxxx>
commit e42e29cc442395d62f1a8963ec2dfb700ba6a5d7 upstream.
This reverts commit cca974daeb6c43ea971f8ceff5a7080d7d49ee30.
The added sanity check is incorrect. BUDMIN is not the wrong value and
is too small.
Signed-off-by: Dave Kleikamp <dave.kleikamp@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
fs/jfs/jfs_dmap.c | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
--- a/fs/jfs/jfs_dmap.c
+++ b/fs/jfs/jfs_dmap.c
@@ -2765,9 +2765,7 @@ static int dbBackSplit(dmtree_t *tp, int
* 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)
{
@@ -2794,10 +2792,6 @@ static int dbJoin(dmtree_t *tp, int leaf
* 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.
Patches currently in stable-queue which might be from dave.kleikamp@xxxxxxxxxx are
queue-6.6/jfs-fix-null-ptr-deref-in-dtinsertentry.patch
queue-6.6/jfs-fix-shift-out-of-bounds-in-dbdiscardag.patch
queue-6.6/jfs-fix-shift-out-of-bounds-in-dbjoin.patch
queue-6.6/revert-jfs-fix-shift-out-of-bounds-in-dbjoin.patch
queue-6.6/jfs-convert-to-bdev_open_by_dev.patch
