From 08866f3dff9ec550e349938c0eca76ddfab02944 Mon Sep 17 00:00:00 2001 From: Nathan Scott Date: Fri, 17 Mar 2006 17:29:36 +1100 Subject: [PATCH] --- yaml --- r: 23151 b: refs/heads/master c: d7929ff670c802dc68d6149d3d0cc5667e18daec h: refs/heads/master i: 23149: ed62e540d2ce5932325a1291f446db8f6fb3cee5 23147: 44bbe2080db1a1412a42137edddef5a4c44f0999 23143: c6e9cab52a9a52b4082f1dee8cfd4bbd45690695 23135: 920fefc811b4a99f8313b47e10d4cb97e78f672b v: v3 --- [refs] | 2 +- trunk/fs/xfs/xfs_attr_leaf.c | 14 +++++--------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index fe43f81bc05b..3955eb86e07f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 984a081a7c89ea7e1b6f47cbc0e5c8ef67ad6e09 +refs/heads/master: d7929ff670c802dc68d6149d3d0cc5667e18daec diff --git a/trunk/fs/xfs/xfs_attr_leaf.c b/trunk/fs/xfs/xfs_attr_leaf.c index e4071eb1e6cf..b3d5c35b6047 100644 --- a/trunk/fs/xfs/xfs_attr_leaf.c +++ b/trunk/fs/xfs/xfs_attr_leaf.c @@ -2938,11 +2938,9 @@ xfs_attr_leaf_inactive(xfs_trans_t **trans, xfs_inode_t *dp, xfs_dabuf_t *bp) ((entry->flags & XFS_ATTR_LOCAL) == 0)) { name_rmt = XFS_ATTR_LEAF_NAME_REMOTE(leaf, i); if (name_rmt->valueblk) { - /* both on-disk, don't endian flip twice */ - lp->valueblk = name_rmt->valueblk; - INT_SET(lp->valuelen, ARCH_CONVERT, - XFS_B_TO_FSB(dp->i_mount, - be32_to_cpu(name_rmt->valuelen))); + lp->valueblk = be32_to_cpu(name_rmt->valueblk); + lp->valuelen = XFS_B_TO_FSB(dp->i_mount, + be32_to_cpu(name_rmt->valuelen)); lp++; } } @@ -2955,10 +2953,8 @@ xfs_attr_leaf_inactive(xfs_trans_t **trans, xfs_inode_t *dp, xfs_dabuf_t *bp) error = 0; for (lp = list, i = 0; i < count; i++, lp++) { tmp = xfs_attr_leaf_freextent(trans, dp, - INT_GET(lp->valueblk, - ARCH_CONVERT), - INT_GET(lp->valuelen, - ARCH_CONVERT)); + lp->valueblk, lp->valuelen); + if (error == 0) error = tmp; /* save only the 1st errno */ }