linux-next: manual merge of the vfs tree with the fscrypt tree

linux-next: manual merge of the vfs tree with the fscrypt tree

[Stephen Rothwell]

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

Hi all,

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

  include/linux/fs.h

between commit:

  a2bd7d2fc32c ("fs-verity: add setup code, UAPI, and Kconfig")

from the fscrypt tree and commit:

  37744f3d21f8 ("vfs: Implement a filesystem superblock creation/configuration context")
  d5ab33dfd7bc ("vfs: syscall: Add fsinfo() to query filesystem information")

from the vfs 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 d7bf524a0517,aae0aec1adb4..000000000000
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@@ -62,8 -61,10 +62,12 @@@ struct workqueue_struct
  struct iov_iter;
  struct fscrypt_info;
  struct fscrypt_operations;
 +struct fsverity_info;
 +struct fsverity_operations;
+ struct fs_context;
+ struct fs_parameter_description;
+ struct fsinfo_kparams;
+ enum fsinfo_attribute;
  
  extern void __init inode_init(void);
  extern void __init inode_init_early(void);

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

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

[Stephen Rothwell]

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

Hi all,

On Fri, 3 May 2019 11:09:51 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the vfs tree got a conflict in:
> 
>   fs/ext4/super.c
>   fs/f2fs/super.c
> 
> between commit:
> 
>   2c58d548f570 ("fscrypt: cache decrypted symlink target in ->i_link")
> 
> from the fscrypt tree and commits:
> 
>   94053139d482 ("ext4: make use of ->free_inode()")
>   d01718a050d0 ("f2fs: switch to ->free_inode()")
> 
> from the vfs 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.
> 
> Thanks, Al, for the heads up and example merge.
> 
> -- 
> Cheers,
> Stephen Rothwell
> 
> diff --cc fs/ext4/super.c
> index 489cdeeab789,981f702848e7..000000000000
> --- a/fs/ext4/super.c
> +++ b/fs/ext4/super.c
> @@@ -1111,12 -1107,8 +1111,9 @@@ static int ext4_drop_inode(struct inod
>   	return drop;
>   }
>   
> - static void ext4_i_callback(struct rcu_head *head)
> + static void ext4_free_in_core_inode(struct inode *inode)
>   {
> - 	struct inode *inode = container_of(head, struct inode, i_rcu);
> - 
>  +	fscrypt_free_inode(inode);
> - 
>   	kmem_cache_free(ext4_inode_cachep, EXT4_I(inode));
>   }
>   
> diff --cc fs/f2fs/super.c
> index f7605b3ff1f9,9924eac76254..000000000000
> --- a/fs/f2fs/super.c
> +++ b/fs/f2fs/super.c
> @@@ -1000,12 -1000,8 +1000,9 @@@ static void f2fs_dirty_inode(struct ino
>   	f2fs_inode_dirtied(inode, false);
>   }
>   
> - static void f2fs_i_callback(struct rcu_head *head)
> + static void f2fs_free_inode(struct inode *inode)
>   {
> - 	struct inode *inode = container_of(head, struct inode, i_rcu);
> - 
>  +	fscrypt_free_inode(inode);
> - 
>   	kmem_cache_free(f2fs_inode_cachep, F2FS_I(inode));
>   }
>   

This is now a conflict between the fscrypt 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 tree with the fscrypt tree

[Stephen Rothwell]

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

Hi all,

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

  fs/ext4/super.c
  fs/f2fs/super.c

between commit:

  2c58d548f570 ("fscrypt: cache decrypted symlink target in ->i_link")

from the fscrypt tree and commits:

  94053139d482 ("ext4: make use of ->free_inode()")
  d01718a050d0 ("f2fs: switch to ->free_inode()")

from the vfs 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.

Thanks, Al, for the heads up and example merge.

-- 
Cheers,
Stephen Rothwell

diff --cc fs/ext4/super.c
index 489cdeeab789,981f702848e7..000000000000
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@@ -1111,12 -1107,8 +1111,9 @@@ static int ext4_drop_inode(struct inod
  	return drop;
  }
  
- static void ext4_i_callback(struct rcu_head *head)
+ static void ext4_free_in_core_inode(struct inode *inode)
  {
- 	struct inode *inode = container_of(head, struct inode, i_rcu);
- 
 +	fscrypt_free_inode(inode);
- 
  	kmem_cache_free(ext4_inode_cachep, EXT4_I(inode));
  }
  
diff --cc fs/f2fs/super.c
index f7605b3ff1f9,9924eac76254..000000000000
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@@ -1000,12 -1000,8 +1000,9 @@@ static void f2fs_dirty_inode(struct ino
  	f2fs_inode_dirtied(inode, false);
  }
  
- static void f2fs_i_callback(struct rcu_head *head)
+ static void f2fs_free_inode(struct inode *inode)
  {
- 	struct inode *inode = container_of(head, struct inode, i_rcu);
- 
 +	fscrypt_free_inode(inode);
- 
  	kmem_cache_free(f2fs_inode_cachep, F2FS_I(inode));
  }
  

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

linux-next: manual merge of the vfs tree with the fscrypt tree

[Stephen Rothwell]

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

Hi all,

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

  include/linux/fs.h

between commit:

  a2bd7d2fc32c ("fs-verity: add setup code, UAPI, and Kconfig")

from the fscrypt tree and commit:

  013c7af575e5 ("vfs: Implement a filesystem superblock creation/configuration context")

from the vfs 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 b2f9913eee10,169ca472d16a..000000000000
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@@ -62,8 -61,8 +62,10 @@@ struct workqueue_struct
  struct iov_iter;
  struct fscrypt_info;
  struct fscrypt_operations;
 +struct fsverity_info;
 +struct fsverity_operations;
+ struct fs_context;
+ struct fs_parameter_description;
  
  extern void __init inode_init(void);
  extern void __init inode_init_early(void);

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