Skip to content

Commit 4080cf0

Browse files
committed
Merge tag 'fs_for_v6.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
Pull ext2, udf, and isofs updates from Jan Kara: - conversion of ext2 to the new mount API - small folio conversion work for ext2 - a fix of an unexpected return value in udf in inode_getblk() - a fix of handling of corrupted directory in isofs * tag 'fs_for_v6.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs: udf: Fix inode_getblk() return value ext2: Make ext2_params_spec static ext2: create ext2_msg_fc for use during parsing ext2: convert to the new mount API ext2: Remove reference to bh->b_page isofs: fix KMSAN uninit-value bug in do_isofs_readdir()
2 parents 172f7c9 + 6afdc60 commit 4080cf0

File tree

4 files changed

+337
-263
lines changed

4 files changed

+337
-263
lines changed

fs/ext2/ext2.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -368,6 +368,7 @@ struct ext2_inode {
368368
#define EXT2_MOUNT_ERRORS_CONT 0x000010 /* Continue on errors */
369369
#define EXT2_MOUNT_ERRORS_RO 0x000020 /* Remount fs ro on errors */
370370
#define EXT2_MOUNT_ERRORS_PANIC 0x000040 /* Panic on errors */
371+
#define EXT2_MOUNT_ERRORS_MASK 0x000070
371372
#define EXT2_MOUNT_MINIX_DF 0x000080 /* Mimics the Minix statfs */
372373
#define EXT2_MOUNT_NOBH 0x000100 /* No buffer_heads */
373374
#define EXT2_MOUNT_NO_UID32 0x000200 /* Disable 32-bit UIDs */

0 commit comments

Comments
 (0)