diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-01-29 18:45:54 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-01-29 18:45:54 -0800 |
| commit | 861c0981648f5b64c86fd028ee622096eb7af05a (patch) | |
| tree | 728ab86bfa1e6363f0fc807912d89d3aebf5be8f /fs | |
| parent | 9b7bd05bebfcd3d369272d41ef32a379708ec933 (diff) | |
| parent | e42e29cc442395d62f1a8963ec2dfb700ba6a5d7 (diff) | |
| download | lwn-861c0981648f5b64c86fd028ee622096eb7af05a.tar.gz lwn-861c0981648f5b64c86fd028ee622096eb7af05a.zip | |
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"
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/jfs/jfs_dmap.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/fs/jfs/jfs_dmap.c b/fs/jfs/jfs_dmap.c index 8eec84c651bf..cb3cda1390ad 100644 --- a/fs/jfs/jfs_dmap.c +++ b/fs/jfs/jfs_dmap.c @@ -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. |