tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull vfs fixes from Al Viro:
"MS_I_VERSION fixes - Mimi's fix + missing bits picked from Matthew
(his patch contained a duplicate of the fs/namespace.c fix as well,
but by that point the original fix had already been applied)"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
Convert fs/*/* to SB_I_VERSION
vfs: fix mounting a filesystem with i_version

Linus Torvalds ec0145e9 0787643a

+7 -6
+1 -1
fs/btrfs/super.c
··· 1135 1135 #ifdef CONFIG_BTRFS_FS_POSIX_ACL 1136 1136 sb->s_flags |= MS_POSIXACL; 1137 1137 #endif 1138 - sb->s_flags |= MS_I_VERSION; 1138 + sb->s_flags |= SB_I_VERSION; 1139 1139 sb->s_iflags |= SB_I_CGROUPWB; 1140 1140 1141 1141 err = super_setup_bdi(sb);
+2 -2
fs/ext4/super.c
··· 1677 1677 sbi->s_mount_flags |= EXT4_MF_FS_ABORTED; 1678 1678 return 1; 1679 1679 case Opt_i_version: 1680 - sb->s_flags |= MS_I_VERSION; 1680 + sb->s_flags |= SB_I_VERSION; 1681 1681 return 1; 1682 1682 case Opt_lazytime: 1683 1683 sb->s_flags |= MS_LAZYTIME; ··· 2060 2060 SEQ_OPTS_PRINT("min_batch_time=%u", sbi->s_min_batch_time); 2061 2061 if (nodefs || sbi->s_max_batch_time != EXT4_DEF_MAX_BATCH_TIME) 2062 2062 SEQ_OPTS_PRINT("max_batch_time=%u", sbi->s_max_batch_time); 2063 - if (sb->s_flags & MS_I_VERSION) 2063 + if (sb->s_flags & SB_I_VERSION) 2064 2064 SEQ_OPTS_PUTS("i_version"); 2065 2065 if (nodefs || sbi->s_stripe) 2066 2066 SEQ_OPTS_PRINT("stripe=%lu", sbi->s_stripe);
+1 -1
fs/fuse/inode.c
··· 1059 1059 if (sb->s_flags & MS_MANDLOCK) 1060 1060 goto err; 1061 1061 1062 - sb->s_flags &= ~(MS_NOSEC | MS_I_VERSION); 1062 + sb->s_flags &= ~(MS_NOSEC | SB_I_VERSION); 1063 1063 1064 1064 if (!parse_fuse_opt(data, &d, is_bdev)) 1065 1065 goto err;
+2 -1
fs/namespace.c
··· 2825 2825 SB_MANDLOCK | 2826 2826 SB_DIRSYNC | 2827 2827 SB_SILENT | 2828 - SB_POSIXACL); 2828 + SB_POSIXACL | 2829 + SB_I_VERSION); 2829 2830 2830 2831 if (flags & MS_REMOUNT) 2831 2832 retval = do_remount(&path, flags, sb_flags, mnt_flags,
+1 -1
fs/xfs/xfs_super.c
··· 1637 1637 1638 1638 /* version 5 superblocks support inode version counters. */ 1639 1639 if (XFS_SB_VERSION_NUM(&mp->m_sb) == XFS_SB_VERSION_5) 1640 - sb->s_flags |= MS_I_VERSION; 1640 + sb->s_flags |= SB_I_VERSION; 1641 1641 1642 1642 if (mp->m_flags & XFS_MOUNT_DAX) { 1643 1643 xfs_warn(mp,