From: Dave Chinner <david@fromorbit.com>
Date: Wed, 14 May 2014 23:39:28 +0000 (+1000)
Subject: Merge branch 'xfs-attr-cleanup' into for-next
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=2d6dcc6d7e95cc83046b2f97e179e6bbb7921245;p=deliverable%2Flinux.git

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

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

2d6dcc6d7e95cc83046b2f97e179e6bbb7921245
diff --cc fs/xfs/xfs_attr.c
index abda1124a70f,86f482e5798f..1fc1f06277da
--- a/fs/xfs/xfs_attr.c
+++ b/fs/xfs/xfs_attr.c
@@@ -213,7 -187,7 +187,7 @@@ xfs_attr_calc_size
  		 * Out of line attribute, cannot double split, but
  		 * make room for the attribute value itself.
  		 */
- 		uint	dblocks = xfs_attr3_rmt_blocks(mp, valuelen);
 -		uint	dblocks = XFS_B_TO_FSB(mp, args->valuelen);
++		uint	dblocks = xfs_attr3_rmt_blocks(mp, args->valuelen);
  		nblks += dblocks;
  		nblks += XFS_NEXTENTADD_SPACE_RES(mp, dblocks, XFS_ATTR_FORK);
  	}