From: Dave Chinner <david@fromorbit.com>
Date: Thu, 4 Jun 2015 03:55:48 +0000 (+1000)
Subject: Merge branch 'xfs-commit-cleanup' into for-next
X-Git-Tag: firefly_0821_release~176^2~1521^2~2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4ea79766168b64766d6c9fcdaa9fab83a6cfebcf;p=firefly-linux-kernel-4.4.55.git

Merge branch 'xfs-commit-cleanup' into for-next

Conflicts:
	fs/xfs/xfs_attr_inactive.c
---

4ea79766168b64766d6c9fcdaa9fab83a6cfebcf
diff --cc fs/xfs/xfs_attr_inactive.c
index 3fbf167cfb4c,48f26ff08880..69a154c58287
--- a/fs/xfs/xfs_attr_inactive.c
+++ b/fs/xfs/xfs_attr_inactive.c
@@@ -380,23 -380,12 +380,22 @@@ xfs_attr3_root_inactive
  	return error;
  }
  
 +/*
 + * xfs_attr_inactive kills all traces of an attribute fork on an inode. It
 + * removes both the on-disk and in-memory inode fork. Note that this also has to
 + * handle the condition of inodes without attributes but with an attribute fork
 + * configured, so we can't use xfs_inode_hasattr() here.
 + *
 + * The in-memory attribute fork is removed even on error.
 + */
  int
 -xfs_attr_inactive(xfs_inode_t *dp)
 +xfs_attr_inactive(
 +	struct xfs_inode	*dp)
  {
 -	xfs_trans_t *trans;
 -	xfs_mount_t *mp;
 -	int error;
 +	struct xfs_trans	*trans;
 +	struct xfs_mount	*mp;
- 	int			cancel_flags = 0;
 +	int			lock_mode = XFS_ILOCK_SHARED;
 +	int			error = 0;
  
  	mp = dp->i_mount;
  	ASSERT(! XFS_NOT_DQATTACHED(mp, dp));
@@@ -416,18 -408,13 +415,17 @@@
  	 * the inode in every transaction to let it float upward through
  	 * the log.
  	 */
 +	lock_mode = 0;
  	trans = xfs_trans_alloc(mp, XFS_TRANS_ATTRINVAL);
  	error = xfs_trans_reserve(trans, &M_RES(mp)->tr_attrinval, 0, 0);
 -	if (error) {
 -		xfs_trans_cancel(trans);
 -		return error;
 -	}
 -	xfs_ilock(dp, XFS_ILOCK_EXCL);
 +	if (error)
 +		goto out_cancel;
 +
 +	lock_mode = XFS_ILOCK_EXCL;
- 	cancel_flags = XFS_TRANS_RELEASE_LOG_RES | XFS_TRANS_ABORT;
 +	xfs_ilock(dp, lock_mode);
 +
 +	if (!XFS_IFORK_Q(dp))
 +		goto out_cancel;
  
  	/*
  	 * No need to make quota reservations here. We expect to release some
@@@ -435,31 -422,29 +433,31 @@@
  	 */
  	xfs_trans_ijoin(trans, dp, 0);
  
 -	/*
 -	 * Decide on what work routines to call based on the inode size.
 -	 */
 -	if (!xfs_inode_hasattr(dp) ||
 -	    dp->i_d.di_aformat == XFS_DINODE_FMT_LOCAL) {
 -		error = 0;
 -		goto out;
 +	/* invalidate and truncate the attribute fork extents */
 +	if (dp->i_d.di_aformat != XFS_DINODE_FMT_LOCAL) {
 +		error = xfs_attr3_root_inactive(&trans, dp);
 +		if (error)
 +			goto out_cancel;
 +
 +		error = xfs_itruncate_extents(&trans, dp, XFS_ATTR_FORK, 0);
 +		if (error)
 +			goto out_cancel;
  	}
 -	error = xfs_attr3_root_inactive(&trans, dp);
 -	if (error)
 -		goto out;
  
 -	error = xfs_itruncate_extents(&trans, dp, XFS_ATTR_FORK, 0);
 -	if (error)
 -		goto out;
 +	/* Reset the attribute fork - this also destroys the in-core fork */
 +	xfs_attr_fork_remove(dp, trans);
  
- 	error = xfs_trans_commit(trans, XFS_TRANS_RELEASE_LOG_RES);
+ 	error = xfs_trans_commit(trans);
 -	xfs_iunlock(dp, XFS_ILOCK_EXCL);
 -
 +	xfs_iunlock(dp, lock_mode);
  	return error;
  
 -out:
 +out_cancel:
- 	xfs_trans_cancel(trans, cancel_flags);
+ 	xfs_trans_cancel(trans);
 -	xfs_iunlock(dp, XFS_ILOCK_EXCL);
 +out_destroy_fork:
 +	/* kill the in-core attr fork before we drop the inode lock */
 +	if (dp->i_afp)
 +		xfs_idestroy_fork(dp, XFS_ATTR_FORK);
 +	if (lock_mode)
 +		xfs_iunlock(dp, lock_mode);
  	return error;
  }
diff --cc fs/xfs/xfs_inode.c
index 17cd90c19634,63cd40022bf4..a37a1011b6e4
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@@ -3166,13 -3068,13 +3083,13 @@@ xfs_rename
  	 * intermediate state on disk.
  	 */
  	if (wip) {
 -		ASSERT(wip->i_d.di_nlink == 0);
 +		ASSERT(VFS_I(wip)->i_nlink == 0 && wip->i_d.di_nlink == 0);
  		error = xfs_bumplink(tp, wip);
  		if (error)
- 			goto out_trans_abort;
+ 			goto out_bmap_cancel;
  		error = xfs_iunlink_remove(tp, wip);
  		if (error)
- 			goto out_trans_abort;
+ 			goto out_bmap_cancel;
  		xfs_trans_log_inode(tp, wip, XFS_ILOG_CORE);
  
  		/*