diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-21 09:57:30 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-21 09:57:30 -0800 |
| commit | d88e8b67a6f2f6dae41c986ed58cb1955e0179b3 (patch) | |
| tree | b36fbfa7ce47ef7ef18d739fbe397598c624bdd7 /fs/jfs/jfs_dmap.c | |
| parent | Merge tag 'locks-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux (diff) | |
| parent | fs/jfs: fix potential integer overflow on shift of a int (diff) | |
| download | linux-dev-d88e8b67a6f2f6dae41c986ed58cb1955e0179b3.tar.xz linux-dev-d88e8b67a6f2f6dae41c986ed58cb1955e0179b3.zip | |
Merge tag 'jfs-5.12' of git://github.com/kleikamp/linux-shaggy
Pull jfs updates from David Kleikamp:
"A few jfs fixes"
* tag 'jfs-5.12' of git://github.com/kleikamp/linux-shaggy:
fs/jfs: fix potential integer overflow on shift of a int
jfs: turn diLog(), dataLog() and txLog() into void functions
JFS: more checks for invalid superblock
Diffstat (limited to 'fs/jfs/jfs_dmap.c')
| -rw-r--r-- | fs/jfs/jfs_dmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/jfs/jfs_dmap.c b/fs/jfs/jfs_dmap.c index 94b7c1cb5ceb..7aee15608619 100644 --- a/fs/jfs/jfs_dmap.c +++ b/fs/jfs/jfs_dmap.c @@ -1656,7 +1656,7 @@ s64 dbDiscardAG(struct inode *ip, int agno, s64 minlen) } else if (rc == -ENOSPC) { /* search for next smaller log2 block */ l2nb = BLKSTOL2(nblocks) - 1; - nblocks = 1 << l2nb; + nblocks = 1LL << l2nb; } else { /* Trim any already allocated blocks */ jfs_error(bmp->db_ipbmap->i_sb, "-EIO\n"); |