Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-04 04:02:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Convert fs/*/* to SB_I_VERSION

Browse Source 
[AV: in addition to the fix in previous commit]

Signed-off-by: Matthew Garrett <mjg59@google.com>
Cc: David Howells <dhowells@redhat.com>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Reviewed-by: David Howells <dhowells@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Matthew Garrett 2017-10-18 13:56:26 -07:00 committed by Al Viro
parent 917086ff23
commit 357fdad075
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/btrfs/super.c
View File

@ -1135,7 +1135,7 @@ static int btrfs_fill_super(struct super_block *sb,
#ifdef CONFIG_BTRFS_FS_POSIX_ACL #ifdef CONFIG_BTRFS_FS_POSIX_ACL
sb->s_flags |= MS_POSIXACL; sb->s_flags |= MS_POSIXACL;
#endif #endif
sb->s_flags |= MS_I_VERSION; sb->s_flags |= SB_I_VERSION;
sb->s_iflags |= SB_I_CGROUPWB; sb->s_iflags |= SB_I_CGROUPWB;
err = super_setup_bdi(sb); err = super_setup_bdi(sb);

4
fs/ext4/super.c
View File

@ -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; sbi->s_mount_flags |= EXT4_MF_FS_ABORTED;
return 1; return 1;
case Opt_i_version: case Opt_i_version:
sb->s_flags |= MS_I_VERSION; sb->s_flags |= SB_I_VERSION;
return 1; return 1;
case Opt_lazytime: case Opt_lazytime:
sb->s_flags |= MS_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); SEQ_OPTS_PRINT("min_batch_time=%u", sbi->s_min_batch_time);
if (nodefs || sbi->s_max_batch_time != EXT4_DEF_MAX_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); 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"); SEQ_OPTS_PUTS("i_version");
if (nodefs || sbi->s_stripe) if (nodefs || sbi->s_stripe)
SEQ_OPTS_PRINT("stripe=%lu", sbi->s_stripe); SEQ_OPTS_PRINT("stripe=%lu", sbi->s_stripe);

2
fs/fuse/inode.c
View File

@ -1059,7 +1059,7 @@ static int fuse_fill_super(struct super_block *sb, void *data, int silent)
if (sb->s_flags & MS_MANDLOCK) if (sb->s_flags & MS_MANDLOCK)
goto err; 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)) if (!parse_fuse_opt(data, &d, is_bdev))
goto err; goto err;

2
fs/xfs/xfs_super.c
View File

@ -1637,7 +1637,7 @@ xfs_fs_fill_super(
/* version 5 superblocks support inode version counters. */ /* version 5 superblocks support inode version counters. */
if (XFS_SB_VERSION_NUM(&mp->m_sb) == XFS_SB_VERSION_5) 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) { if (mp->m_flags & XFS_MOUNT_DAX) {
xfs_warn(mp, xfs_warn(mp,