]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
Merge tag 'jfs-6.6' of github.com:kleikamp/linux-shaggy
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 31 Aug 2023 22:25:01 +0000 (15:25 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 31 Aug 2023 22:25:01 +0000 (15:25 -0700)
Pull jfs updates from Dave Kleikamp:
 "A few small fixes"

* tag 'jfs-6.6' of github.com:kleikamp/linux-shaggy:
  jfs: validate max amount of blocks before allocation.
  jfs: remove redundant initialization to pointer ip
  jfs: fix invalid free of JFS_IP(ipimap)->i_imap in diUnmount
  FS: JFS: (trivial) Fix grammatical error in extAlloc
  fs/jfs: prevent double-free in dbUnmount() after failed jfs_remount()

1  2 
fs/jfs/jfs_imap.c
fs/jfs/namei.c

Simple merge
diff --cc fs/jfs/namei.c
Simple merge