linux-next: manual merge of the xfs tree with the pidfd tree

[Stephen Rothwell]

Hi all,

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

  fs/xfs/xfs_ioctl.c

between commit:

  f736d93d76d3 ("xfs: support idmapped mounts")

from the pidfd tree and commit:

  7317a03df703 ("xfs: refactor inode ownership change transaction/inode/quota 
allocation idiom")

from the xfs 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_ioctl.c
index 3d4c7ca080fb,248083ea0276..000000000000
--- a/fs/xfs/xfs_ioctl.c
+++ b/fs/xfs/xfs_ioctl.c
@@@ -1280,9 -1275,9 +1280,10 @@@ xfs_ioctl_setattr_prepare_dax
   */
  static struct xfs_trans *
  xfs_ioctl_setattr_get_trans(
-       struct file             *file)
 -      struct xfs_inode        *ip,
++      struct file             *file,
+       struct xfs_dquot        *pdqp)
  {
 +      struct xfs_inode        *ip = XFS_I(file_inode(file));
        struct xfs_mount        *mp = ip->i_mount;
        struct xfs_trans        *tp;
        int                     error = -EROFS;
@@@ -1470,9 -1461,9 +1469,9 @@@ xfs_ioctl_setattr
  
        xfs_ioctl_setattr_prepare_dax(ip, fa);
  
-       tp = xfs_ioctl_setattr_get_trans(file);
 -      tp = xfs_ioctl_setattr_get_trans(ip, pdqp);
++      tp = xfs_ioctl_setattr_get_trans(file, pdqp);
        if (IS_ERR(tp)) {
-               code = PTR_ERR(tp);
+               error = PTR_ERR(tp);
                goto error_free_dquots;
        }
  
@@@ -1615,7 -1599,7 +1606,7 @@@ xfs_ioc_setxflags
  
        xfs_ioctl_setattr_prepare_dax(ip, &fa);
  
-       tp = xfs_ioctl_setattr_get_trans(filp);
 -      tp = xfs_ioctl_setattr_get_trans(ip, NULL);
++      tp = xfs_ioctl_setattr_get_trans(filp, NULL);
        if (IS_ERR(tp)) {
                error = PTR_ERR(tp);
                goto out_drop_write;

pgp114GCXamQX.pgp
Description: OpenPGP digital signature