Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Fri, 3 May 2019 11:15:10 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Al Viro <viro@ZenIV.linux.org.uk>,
        Mike Marshall <hubcap@omnibond.com>
Cc:     Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Martin Brandenburg <martin@omnibond.com>
Subject: linux-next: manual merge of the vfs tree with the orangefs tree
Message-ID: <20190503111510.6e866e3b@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
 boundary="Sig_/Pi+73itdhPqitBme2i5CtD/"; protocol="application/pgp-signature"
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

--Sig_/Pi+73itdhPqitBme2i5CtD/
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  fs/orangefs/super.c

between commit:

  77becb76042a ("orangefs: implement xattr cache")

from the orangefs tree and commit:

  f276ae0dd6d0 ("orangefs: make use of ->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.

--=20
Cheers,
Stephen Rothwell

diff --cc fs/orangefs/super.c
index 8fa30c13b7ed,3784f7e8b603..000000000000
--- a/fs/orangefs/super.c
+++ b/fs/orangefs/super.c
@@@ -125,20 -124,9 +125,19 @@@ static struct inode *orangefs_alloc_ino
  	return &orangefs_inode->vfs_inode;
  }
 =20
- static void orangefs_i_callback(struct rcu_head *head)
+ static void orangefs_free_inode(struct inode *inode)
  {
- 	struct inode *inode =3D container_of(head, struct inode, i_rcu);
 -	kmem_cache_free(orangefs_inode_cache, ORANGEFS_I(inode));
 +	struct orangefs_inode_s *orangefs_inode =3D ORANGEFS_I(inode);
 +	struct orangefs_cached_xattr *cx;
 +	struct hlist_node *tmp;
 +	int i;
 +
 +	hash_for_each_safe(orangefs_inode->xattr_cache, i, tmp, cx, node) {
 +		hlist_del(&cx->node);
 +		kfree(cx);
 +	}
 +
 +	kmem_cache_free(orangefs_inode_cache, orangefs_inode);
  }
 =20
  static void orangefs_destroy_inode(struct inode *inode)
@@@ -148,17 -136,8 +147,15 @@@
  	gossip_debug(GOSSIP_SUPER_DEBUG,
  			"%s: deallocated %p destroying inode %pU\n",
  			__func__, orangefs_inode, get_khandle_from_ino(inode));
-=20
- 	call_rcu(&inode->i_rcu, orangefs_i_callback);
  }
 =20
 +static int orangefs_write_inode(struct inode *inode,
 +				struct writeback_control *wbc)
 +{
 +	gossip_debug(GOSSIP_SUPER_DEBUG, "orangefs_write_inode\n");
 +	return orangefs_inode_setattr(inode);
 +}
 +
  /*
   * NOTE: information filled in here is typically reflected in the
   * output of the system command 'df'
@@@ -316,8 -295,8 +313,9 @@@ void fsid_key_table_finalize(void
 =20
  static const struct super_operations orangefs_s_ops =3D {
  	.alloc_inode =3D orangefs_alloc_inode,
+ 	.free_inode =3D orangefs_free_inode,
  	.destroy_inode =3D orangefs_destroy_inode,
 +	.write_inode =3D orangefs_write_inode,
  	.drop_inode =3D generic_delete_inode,
  	.statfs =3D orangefs_statfs,
  	.remount_fs =3D orangefs_remount_fs,

--Sig_/Pi+73itdhPqitBme2i5CtD/
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAlzLlh4ACgkQAVBC80lX
0GzA1AgAhy3RIu6w7cHrdlvDjWpV5l+Xf9jr5PE4/zYFAXectc6fw2M2gKJx0UTQ
QXQlMkuotzW5I2AbfhMTjMIIsUHb9AjFrbTXqldHxre3h/VsSRZFOOjAuLga+D4W
BGmIQ1Rf2Rq2CRoZn760acF3eORAWVboxwfvAdBGJabvqxbHQl392VR6qp1IuCWH
WdpqoS7awJRq5I2MYnX6cY9lk2HrUB0wQkvtpFgGqzBWPxsmB8Va1/dJY/ph/zy1
9SnZqWJGHh9iLHYQzL+wF3RZf4RnqSFIJWtX3JIEY19WWkG5uquZYnWnNbz0sVF+
hJvrVYBzQyW4YOAWsTDmFeBsdCiRWg==
=6kG4
-----END PGP SIGNATURE-----

--Sig_/Pi+73itdhPqitBme2i5CtD/--