Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec0145e9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 0787643a 357fdad0

fs/btrfs/super.c

+1 −1
Original line number Diff line number Diff line
@@ -1135,7 +1135,7 @@ static int btrfs_fill_super(struct super_block *sb, 
#ifdef CONFIG_BTRFS_FS_POSIX_ACL

	sb->s_flags |= MS_POSIXACL;

#endif

	sb->s_flags |= MS_I_VERSION;

	sb->s_flags |= SB_I_VERSION;

	sb->s_iflags |= SB_I_CGROUPWB;



	err = super_setup_bdi(sb);

fs/ext4/super.c

+2 −2
Original line number Diff line number Diff line
@@ -1677,7 +1677,7 @@ static int handle_mount_opt(struct super_block *sb, char *opt, int token, 
		sbi->s_mount_flags |= EXT4_MF_FS_ABORTED;

		return 1;

	case Opt_i_version:

		sb->s_flags |= MS_I_VERSION;

		sb->s_flags |= SB_I_VERSION;

		return 1;

	case Opt_lazytime:

		sb->s_flags |= MS_LAZYTIME;
@@ -2060,7 +2060,7 @@ static int _ext4_show_options(struct seq_file *seq, struct super_block *sb, 
		SEQ_OPTS_PRINT("min_batch_time=%u", sbi->s_min_batch_time);

	if (nodefs || sbi->s_max_batch_time != EXT4_DEF_MAX_BATCH_TIME)

		SEQ_OPTS_PRINT("max_batch_time=%u", sbi->s_max_batch_time);

	if (sb->s_flags & MS_I_VERSION)

	if (sb->s_flags & SB_I_VERSION)

		SEQ_OPTS_PUTS("i_version");

	if (nodefs || sbi->s_stripe)

		SEQ_OPTS_PRINT("stripe=%lu", sbi->s_stripe);

fs/fuse/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -1059,7 +1059,7 @@ static int fuse_fill_super(struct super_block *sb, void *data, int silent) 
	if (sb->s_flags & MS_MANDLOCK)

		goto err;



	sb->s_flags &= ~(MS_NOSEC | MS_I_VERSION);

	sb->s_flags &= ~(MS_NOSEC | SB_I_VERSION);



	if (!parse_fuse_opt(data, &d, is_bdev))

		goto err;

fs/namespace.c

+2 −1
Original line number Diff line number Diff line
@@ -2825,7 +2825,8 @@ long do_mount(const char *dev_name, const char __user *dir_name, 
			    SB_MANDLOCK |

			    SB_DIRSYNC |

			    SB_SILENT |

			    SB_POSIXACL);

			    SB_POSIXACL |

			    SB_I_VERSION);



	if (flags & MS_REMOUNT)

		retval = do_remount(&path, flags, sb_flags, mnt_flags,

fs/xfs/xfs_super.c

+1 −1
Original line number Diff line number Diff line
@@ -1637,7 +1637,7 @@ xfs_fs_fill_super( 


	/* version 5 superblocks support inode version counters. */

	if (XFS_SB_VERSION_NUM(&mp->m_sb) == XFS_SB_VERSION_5)

		sb->s_flags |= MS_I_VERSION;

		sb->s_flags |= SB_I_VERSION;



	if (mp->m_flags & XFS_MOUNT_DAX) {

		xfs_warn(mp,