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

Conflicts:
	fs/xfs/xfs_attr.c

diff --cc fs/xfs/xfs_attr.c
index abda112,86f482e..1fc1f06
--- 1/fs/xfs/xfs_attr.c
--- 2/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);
        }