diff options
| author | Brian Foster <bfoster@redhat.com> | 2015-04-13 04:27:59 +0300 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2015-04-13 04:27:59 +0300 |
| commit | 66db8104968ad8c0bf5a45a100ae586ddfadc1e1 (patch) | |
| tree | 38fbc56644a981f6b5a7bc60955d0b03cc6ac9d0 /fs/xfs/libxfs/xfs_attr_leaf.c | |
| parent | e87021a2bc100d330ae859c2cc0614be3e335c5a (diff) | |
| download | linux-66db8104968ad8c0bf5a45a100ae586ddfadc1e1.tar.xz | |
xfs: kill unnecessary firstused overflow check on attr3 leaf removal
xfs_attr3_leaf_remove() removes an attribute from an attr leaf block. If
the attribute nameval data happens to be at the start of the nameval
region, a new start offset (firstused) for the region is calculated
(since the region grows from the tail of the block to the start). Once
the new firstused is calculated, it is checked for zero in an apparent
overflow check.
Now that the in-core firstused is 32-bit, overflow is not possible and
this check can be removed. Since the purpose for this check is not
documented and appears to exist since the port to Linux, be conservative
and replace it with an assert.
Signed-off-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
Diffstat (limited to 'fs/xfs/libxfs/xfs_attr_leaf.c')
| -rw-r--r-- | fs/xfs/libxfs/xfs_attr_leaf.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/xfs/libxfs/xfs_attr_leaf.c b/fs/xfs/libxfs/xfs_attr_leaf.c index 149ef3f66735..04e79d57bca6 100644 --- a/fs/xfs/libxfs/xfs_attr_leaf.c +++ b/fs/xfs/libxfs/xfs_attr_leaf.c @@ -1996,8 +1996,7 @@ xfs_attr3_leaf_remove( tmp = be16_to_cpu(entry->nameidx); } ichdr.firstused = tmp; - if (!ichdr.firstused) - ichdr.firstused = tmp - XFS_ATTR_LEAF_NAME_ALIGN; + ASSERT(ichdr.firstused != 0); } else { ichdr.holes = 1; /* mark as needing compaction */ } |