diff options
-rw-r--r-- | fs/xfs/xfs_attr_leaf.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/fs/xfs/xfs_attr_leaf.c b/fs/xfs/xfs_attr_leaf.c index e4071eb1e6cf..b3d5c35b6047 100644 --- a/fs/xfs/xfs_attr_leaf.c +++ b/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) | |||
2938 | ((entry->flags & XFS_ATTR_LOCAL) == 0)) { | 2938 | ((entry->flags & XFS_ATTR_LOCAL) == 0)) { |
2939 | name_rmt = XFS_ATTR_LEAF_NAME_REMOTE(leaf, i); | 2939 | name_rmt = XFS_ATTR_LEAF_NAME_REMOTE(leaf, i); |
2940 | if (name_rmt->valueblk) { | 2940 | if (name_rmt->valueblk) { |
2941 | /* both on-disk, don't endian flip twice */ | 2941 | lp->valueblk = be32_to_cpu(name_rmt->valueblk); |
2942 | lp->valueblk = name_rmt->valueblk; | 2942 | lp->valuelen = XFS_B_TO_FSB(dp->i_mount, |
2943 | INT_SET(lp->valuelen, ARCH_CONVERT, | 2943 | be32_to_cpu(name_rmt->valuelen)); |
2944 | XFS_B_TO_FSB(dp->i_mount, | ||
2945 | be32_to_cpu(name_rmt->valuelen))); | ||
2946 | lp++; | 2944 | lp++; |
2947 | } | 2945 | } |
2948 | } | 2946 | } |
@@ -2955,10 +2953,8 @@ xfs_attr_leaf_inactive(xfs_trans_t **trans, xfs_inode_t *dp, xfs_dabuf_t *bp) | |||
2955 | error = 0; | 2953 | error = 0; |
2956 | for (lp = list, i = 0; i < count; i++, lp++) { | 2954 | for (lp = list, i = 0; i < count; i++, lp++) { |
2957 | tmp = xfs_attr_leaf_freextent(trans, dp, | 2955 | tmp = xfs_attr_leaf_freextent(trans, dp, |
2958 | INT_GET(lp->valueblk, | 2956 | lp->valueblk, lp->valuelen); |
2959 | ARCH_CONVERT), | 2957 | |
2960 | INT_GET(lp->valuelen, | ||
2961 | ARCH_CONVERT)); | ||
2962 | if (error == 0) | 2958 | if (error == 0) |
2963 | error = tmp; /* save only the 1st errno */ | 2959 | error = tmp; /* save only the 1st errno */ |
2964 | } | 2960 | } |