]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
Merge tag 'fs_for_v7.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 16 Apr 2026 02:22:16 +0000 (19:22 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 16 Apr 2026 02:22:16 +0000 (19:22 -0700)
Pull ext2, udf, quota updates from Jan Kara:

 - A fix for a race in quota code that can expose ocfs2 to
   use-after-free issues

 - UDF fix to avoid memory corruption in face of corrupted format

 - Couple of ext2 fixes for better handling of fs corruption

 - Some more various code cleanups in UDF & ext2

* tag 'fs_for_v7.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  ext2: reject inodes with zero i_nlink and valid mode in ext2_iget()
  ext2: use get_random_u32() where appropriate
  quota: Fix race of dquot_scan_active() with quota deactivation
  udf: fix partition descriptor append bookkeeping
  ext2: avoid drop_nlink() during unlink of zero-nlink inode in ext2_unlink()
  ext2: guard reservation window dump with EXT2FS_DEBUG
  ext2: replace BUG_ON with WARN_ON_ONCE in ext2_get_blocks
  ext2: remove stale TODO about kmap
  fs: udf: avoid assignment in condition when selecting allocation goal

1  2 
fs/ext2/inode.c
fs/ext2/super.c
fs/udf/inode.c
fs/udf/super.c

diff --cc fs/ext2/inode.c
Simple merge
diff --cc fs/ext2/super.c
Simple merge
diff --cc fs/udf/inode.c
Simple merge
diff --cc fs/udf/super.c
Simple merge