[PATCH 9] xfsprogs: issues with a24374f41c9

[Ben Myers <bpm@xxxxxxx>]

This patch corresponds with kernel commit 517c22207b04.  There were a couple
bits that didn't match when it was copied to libxfs.

---
 libxfs/xfs_attr.c      |    2 +-
 libxfs/xfs_attr_leaf.c |    3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

Index: b/libxfs/xfs_attr.c
===================================================================
--- a/libxfs/xfs_attr.c 2013-08-06 13:38:35.480817970 -0500
+++ b/libxfs/xfs_attr.c 2013-08-06 13:38:56.660877582 -0500
@@ -861,7 +861,7 @@ xfs_attr_leaf_removename(xfs_da_args_t *
        error = xfs_attr3_leaf_lookup_int(bp, args);
        if (error == ENOATTR) {
                xfs_trans_brelse(args->trans, bp);
-               return(error);
+               return error;
        }
 
        xfs_attr3_leaf_remove(bp, args);
Index: b/libxfs/xfs_attr_leaf.c
===================================================================
--- a/libxfs/xfs_attr_leaf.c    2013-08-06 13:39:07.140818083 -0500
+++ b/libxfs/xfs_attr_leaf.c    2013-08-06 13:39:29.450857207 -0500
@@ -1111,7 +1111,6 @@ xfs_attr3_leaf_add_work(
        struct xfs_attr_leaf_entry *entry;
        struct xfs_attr_leaf_name_local *name_loc;
        struct xfs_attr_leaf_name_remote *name_rmt;
-       struct xfs_attr_leaf_map *map;
        struct xfs_mount        *mp;
        int                     tmp;
        int                     i;
@@ -1210,7 +1209,7 @@ xfs_attr3_leaf_add_work(
        tmp = (ichdr->count - 1) * sizeof(xfs_attr_leaf_entry_t)
                                        + xfs_attr3_leaf_hdr_size(leaf);
 
-       for (i = 0; i < XFS_ATTR_LEAF_MAPSIZE; map++, i++) {
+       for (i = 0; i < XFS_ATTR_LEAF_MAPSIZE; i++) {
                if (ichdr->freemap[i].base == tmp) {
                        ichdr->freemap[i].base += sizeof(xfs_attr_leaf_entry_t);
                        ichdr->freemap[i].size -= sizeof(xfs_attr_leaf_entry_t);