diff options
| author | Darrick J. Wong <darrick.wong@oracle.com> | 2018-06-03 16:10:13 -0700 |
|---|---|---|
| committer | Darrick J. Wong <darrick.wong@oracle.com> | 2018-06-04 14:45:29 -0700 |
| commit | b3986010cea509842edf15c56ca10c18befdcafb (patch) | |
| tree | 3a59a3e5b4d6b894d37ebd3ead73ced8c4951476 /fs/xfs | |
| parent | 17ba2cc7b5b9ee6a44baf5e169c8901f1f049ea8 (diff) | |
| download | linux-stable-b3986010cea509842edf15c56ca10c18befdcafb.tar.gz linux-stable-b3986010cea509842edf15c56ca10c18befdcafb.tar.bz2 linux-stable-b3986010cea509842edf15c56ca10c18befdcafb.zip | |
xfs: remove redundant ASSERT on insufficient bestfree length in _leaf_addname
In xfs_dir2_leaf_addname we ASSERT if the length of the unused space
described by bestfree[0] is less the amount of space we wish to consume.
Immediately after it is a call to xfs_dir2_data_use_free where the
offset parameter is offset of the unused space and the length parameter
is the amount of space we wish to consume. Both values (and the unused
space pointer) are passed into xfs_dir2_data_check_free, which also
validates that the region of unused space is big enough to cover the
space we wish to consume. This is effectively the same check that the
ASSERT covers, and since a check failure results in a corruption message
being logged we can remove the ASSERT.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Diffstat (limited to 'fs/xfs')
| -rw-r--r-- | fs/xfs/libxfs/xfs_dir2_leaf.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/xfs/libxfs/xfs_dir2_leaf.c b/fs/xfs/libxfs/xfs_dir2_leaf.c index 50fc9c0c5e2b..9367f2a41b35 100644 --- a/fs/xfs/libxfs/xfs_dir2_leaf.c +++ b/fs/xfs/libxfs/xfs_dir2_leaf.c @@ -872,7 +872,6 @@ xfs_dir2_leaf_addname( */ dup = (xfs_dir2_data_unused_t *) ((char *)hdr + be16_to_cpu(bf[0].offset)); - ASSERT(be16_to_cpu(dup->length) >= length); needscan = needlog = 0; /* * Mark the initial part of our freespace in use for the new entry. |