linux-next: manual merge of the vfs-brauner tree with the ext3 tree

linux-next: manual merge of the vfs-brauner tree with the ext3 tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2403 bytes --]

Hi all,

Today's linux-next merge of the vfs-brauner tree got a conflict in:

  fs/ext2/dir.c

between commits:

  1de0736c3af9 ("ext2: Convert ext2_add_link() to use a folio")
  7e56bbf15d95 ("ext2: Convert ext2_delete_entry() to use folios")
  82dd620653b3 ("ext2: Convert ext2_prepare_chunk and ext2_commit_chunk to folios")

from the ext3 tree and commit:

  5cdc59fce617 ("ext2: convert to new timestamp accessors")

from the vfs-brauner tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc fs/ext2/dir.c
index 6807df637112,c7900868171b..000000000000
--- a/fs/ext2/dir.c
+++ b/fs/ext2/dir.c
@@@ -463,9 -466,9 +463,9 @@@ int ext2_set_link(struct inode *dir, st
  	}
  	de->inode = cpu_to_le32(inode->i_ino);
  	ext2_set_de_type(de, inode);
 -	ext2_commit_chunk(page, pos, len);
 +	ext2_commit_chunk(folio, pos, len);
  	if (update_times)
- 		dir->i_mtime = inode_set_ctime_current(dir);
+ 		inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir));
  	EXT2_I(dir)->i_flags &= ~EXT2_BTREE_FL;
  	mark_inode_dirty(dir);
  	return ext2_handle_dirsync(dir);
@@@ -551,8 -554,8 +551,8 @@@ got_it
  	memcpy(de->name, name, namelen);
  	de->inode = cpu_to_le32(inode->i_ino);
  	ext2_set_de_type (de, inode);
 -	ext2_commit_chunk(page, pos, rec_len);
 +	ext2_commit_chunk(folio, pos, rec_len);
- 	dir->i_mtime = inode_set_ctime_current(dir);
+ 	inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir));
  	EXT2_I(dir)->i_flags &= ~EXT2_BTREE_FL;
  	mark_inode_dirty(dir);
  	err = ext2_handle_dirsync(dir);
@@@ -605,8 -605,8 +605,8 @@@ int ext2_delete_entry(struct ext2_dir_e
  	if (pde)
  		pde->rec_len = ext2_rec_len_to_disk(to - from);
  	dir->inode = 0;
 -	ext2_commit_chunk(page, pos, to - from);
 +	ext2_commit_chunk(folio, pos, to - from);
- 	inode->i_mtime = inode_set_ctime_current(inode);
+ 	inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode));
  	EXT2_I(inode)->i_flags &= ~EXT2_BTREE_FL;
  	mark_inode_dirty(inode);
  	return ext2_handle_dirsync(inode);

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the vfs-brauner tree with the ext3 tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2677 bytes --]

Hi all,

On Fri, 27 Oct 2023 10:43:56 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> Today's linux-next merge of the vfs-brauner tree got a conflict in:
> 
>   fs/ext2/dir.c
> 
> between commits:
> 
>   1de0736c3af9 ("ext2: Convert ext2_add_link() to use a folio")
>   7e56bbf15d95 ("ext2: Convert ext2_delete_entry() to use folios")
>   82dd620653b3 ("ext2: Convert ext2_prepare_chunk and ext2_commit_chunk to folios")
> 
> from the ext3 tree and commit:
> 
>   5cdc59fce617 ("ext2: convert to new timestamp accessors")
> 
> from the vfs-brauner tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
> 
> diff --cc fs/ext2/dir.c
> index 6807df637112,c7900868171b..000000000000
> --- a/fs/ext2/dir.c
> +++ b/fs/ext2/dir.c
> @@@ -463,9 -466,9 +463,9 @@@ int ext2_set_link(struct inode *dir, st
>   	}
>   	de->inode = cpu_to_le32(inode->i_ino);
>   	ext2_set_de_type(de, inode);
>  -	ext2_commit_chunk(page, pos, len);
>  +	ext2_commit_chunk(folio, pos, len);
>   	if (update_times)
> - 		dir->i_mtime = inode_set_ctime_current(dir);
> + 		inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir));
>   	EXT2_I(dir)->i_flags &= ~EXT2_BTREE_FL;
>   	mark_inode_dirty(dir);
>   	return ext2_handle_dirsync(dir);
> @@@ -551,8 -554,8 +551,8 @@@ got_it
>   	memcpy(de->name, name, namelen);
>   	de->inode = cpu_to_le32(inode->i_ino);
>   	ext2_set_de_type (de, inode);
>  -	ext2_commit_chunk(page, pos, rec_len);
>  +	ext2_commit_chunk(folio, pos, rec_len);
> - 	dir->i_mtime = inode_set_ctime_current(dir);
> + 	inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir));
>   	EXT2_I(dir)->i_flags &= ~EXT2_BTREE_FL;
>   	mark_inode_dirty(dir);
>   	err = ext2_handle_dirsync(dir);
> @@@ -605,8 -605,8 +605,8 @@@ int ext2_delete_entry(struct ext2_dir_e
>   	if (pde)
>   		pde->rec_len = ext2_rec_len_to_disk(to - from);
>   	dir->inode = 0;
>  -	ext2_commit_chunk(page, pos, to - from);
>  +	ext2_commit_chunk(folio, pos, to - from);
> - 	inode->i_mtime = inode_set_ctime_current(inode);
> + 	inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode));
>   	EXT2_I(inode)->i_flags &= ~EXT2_BTREE_FL;
>   	mark_inode_dirty(inode);
>   	return ext2_handle_dirsync(inode);

This is now a conflict between the ext3 tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the vfs-brauner tree with the ext3 tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1270 bytes --]

Hi all,

Today's linux-next merge of the vfs-brauner tree got a conflict in:

  fs/ext4/super.c

between commit:

  fab2eb0fd1b8 ("ext4: enable pre-content events")

from the ext3 tree and commit:

  729f35ab8b0a ("ext4: switch to multigrain timestamps")

from the vfs-brauner tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc fs/ext4/super.c
index a1a84100b230,a125d9435b8a..000000000000
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@@ -7329,7 -7298,7 +7329,8 @@@ static struct file_system_type ext4_fs_
  	.init_fs_context	= ext4_init_fs_context,
  	.parameters		= ext4_param_specs,
  	.kill_sb		= ext4_kill_sb,
- 	.fs_flags		= FS_REQUIRES_DEV | FS_ALLOW_IDMAP | FS_ALLOW_HSM,
 -	.fs_flags		= FS_REQUIRES_DEV | FS_ALLOW_IDMAP | FS_MGTIME,
++	.fs_flags		= FS_REQUIRES_DEV | FS_ALLOW_IDMAP |
++				  FS_ALLOW_HSM | FS_MGTIME,
  };
  MODULE_ALIAS_FS("ext4");
  

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the vfs-brauner tree with the ext3 tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1229 bytes --]

Hi all,

Today's linux-next merge of the vfs-brauner tree got a conflict in:

  fs/btrfs/super.c

between commit:

  ec24789ec8d6 ("btrfs: disable defrag on pre-content watched files")

from the ext3 tree and commit:

  c7e408a168b5 ("btrfs: convert to multigrain timestamps")

from the vfs-brauner tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc fs/btrfs/super.c
index c9aef6708779,d423acfe11d0..000000000000
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@@ -2199,7 -2199,7 +2199,7 @@@ static struct file_system_type btrfs_fs
  	.parameters		= btrfs_fs_parameters,
  	.kill_sb		= btrfs_kill_super,
  	.fs_flags		= FS_REQUIRES_DEV | FS_BINARY_MOUNTDATA |
- 				  FS_ALLOW_IDMAP | FS_ALLOW_HSM,
 -				  FS_ALLOW_IDMAP | FS_MGTIME,
++				  FS_ALLOW_IDMAP | FS_ALLOW_HSM | FS_MGTIME,
   };
  
  MODULE_ALIAS_FS("btrfs");

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the vfs-brauner tree with the ext3 tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1299 bytes --]

Hi all,

Today's linux-next merge of the vfs-brauner tree got a conflict in:

  fs/xfs/xfs_super.c

between commit:

  436df5326f57 ("xfs: add pre-content fsnotify hook for write faults")

from the ext3 tree and commit:

  3062a738d73c ("xfs: switch to multigrain timestamps")

from the vfs-brauner tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc fs/xfs/xfs_super.c
index 4424217e9269,97c854ed4173..000000000000
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@@ -2051,7 -2064,7 +2063,8 @@@ static struct file_system_type xfs_fs_t
  	.init_fs_context	= xfs_init_fs_context,
  	.parameters		= xfs_fs_parameters,
  	.kill_sb		= xfs_kill_sb,
- 	.fs_flags		= FS_REQUIRES_DEV | FS_ALLOW_IDMAP | FS_ALLOW_HSM,
 -	.fs_flags		= FS_REQUIRES_DEV | FS_ALLOW_IDMAP | FS_MGTIME,
++	.fs_flags		= FS_REQUIRES_DEV | FS_ALLOW_IDMAP |
++				  FS_ALLOW_HSM | FS_MGTIME,
  };
  MODULE_ALIAS_FS("xfs");
  

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the vfs-brauner tree with the ext3 tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1575 bytes --]

Hi all,

Today's linux-next merge of the vfs-brauner tree got a conflict in:

  include/linux/fs.h

between commit:

  77b863655092 ("fs: add a flag to indicate the fs supports pre-content events")

from the ext3 tree and commit:

  a037d5e7f81b ("fs: add infrastructure for multigrain timestamps")

from the vfs-brauner tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc include/linux/fs.h
index 6f3a50c0a958,a6b2addd80db..000000000000
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@@ -2501,7 -2542,7 +2543,8 @@@ struct file_system_type 
  #define FS_USERNS_MOUNT		8	/* Can be mounted by userns root */
  #define FS_DISALLOW_NOTIFY_PERM	16	/* Disable fanotify permission events */
  #define FS_ALLOW_IDMAP         32      /* FS has been updated to handle vfs idmappings. */
 -#define FS_MGTIME		64	/* FS uses multigrain timestamps */
 +#define FS_ALLOW_HSM		64	/* FS can handle fanotify pre-content events. */
++#define FS_MGTIME		128	/* FS uses multigrain timestamps */
  #define FS_RENAME_DOES_D_MOVE	32768	/* FS will handle d_move() during rename() internally. */
  	int (*init_fs_context)(struct fs_context *);
  	const struct fs_parameter_spec *parameters;

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the vfs-brauner tree with the ext3 tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 871 bytes --]

Hi all,

Today's linux-next merge of the vfs-brauner tree got a conflict in:

  fs/quota/dquot.c

between commit:

  72b7ceca857f3 ("fs: quota: create dedicated workqueue for quota_release_work")

from the ext3 tree and commit:

  08621f25a2687 ("fs: replace use of system_unbound_wq with system_dfl_wq")

from the vfs-brauner tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc fs/quota/dquot.c
index 6c4a6ee1fa2b6,afa15a2145382..0000000000000
--- a/fs/quota/dquot.c
+++ b/fs/quota/dquot.c

(ext3 version)

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]