On Fri, Jun 07, 2013 at 10:25:38AM +1000, Dave Chinner wrote:
> From: Dave Chinner <dchinner@xxxxxxxxxx>
>
> Signed-off-by: Dave Chinner <dchinner@xxxxxxxxxx>
This one corresponds to commit 517c22207b04.
The xfs_db, metadump, and repair changes look good.
Note don't have xfs_attr_inactive, xfs_attr_leaf_list, xfs_attr_node_list,
xfs_attr_node_inactive, xfs_attr_leaf_inactive, xfs_attr_leaf_freextent,
xfs_attr_root_inactive, and xfs_attr_leaf_list_int in userspace.
> @@ -854,24 +854,24 @@ xfs_attr_leaf_removename(xfs_da_args_t *args)
> */
> dp = args->dp;
> args->blkno = 0;
> - error = xfs_attr_leaf_read(args->trans, args->dp, args->blkno, -1, &bp);
> + error = xfs_attr3_leaf_read(args->trans, args->dp, args->blkno, -1, &bp);
> if (error)
> return error;
>
> - error = xfs_attr_leaf_lookup_int(bp, args);
> + error = xfs_attr3_leaf_lookup_int(bp, args);
> if (error == ENOATTR) {
> xfs_trans_brelse(args->trans, bp);
> return(error);
In the kernel patch the parens are removed:
return error;
Again, this is probably fixed in a subsequent patch.
> STATIC int
> -xfs_attr_leaf_add_work(
> - struct xfs_buf *bp,
> - xfs_da_args_t *args,
> - int mapindex)
> +xfs_attr3_leaf_add_work(
> + struct xfs_buf *bp,
> + struct xfs_attr3_icleaf_hdr *ichdr,
> + struct xfs_da_args *args,
> + int mapindex)
> {
> - xfs_attr_leafblock_t *leaf;
> - xfs_attr_leaf_hdr_t *hdr;
> - xfs_attr_leaf_entry_t *entry;
> - xfs_attr_leaf_name_local_t *name_loc;
> - xfs_attr_leaf_name_remote_t *name_rmt;
> - xfs_attr_leaf_map_t *map;
> - xfs_mount_t *mp;
> - int tmp, i;
> + struct xfs_attr_leafblock *leaf;
> + 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;
The kernel commit removed map. Probably fixed in a subsequent patch.
Reviewed-by: Ben Myers <bpm@xxxxxxx>
_______________________________________________
xfs mailing list
xfs@xxxxxxxxxxx
http://oss.sgi.com/mailman/listinfo/xfs
