瀏覽代碼

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>
Brian Foster 10 年之前
父節點
當前提交
66db810496
共有 1 個文件被更改,包括 1 次插入2 次删除
  1. 1 2
      fs/xfs/libxfs/xfs_attr_leaf.c

+ 1 - 2
fs/xfs/libxfs/xfs_attr_leaf.c

@@ -1996,8 +1996,7 @@ xfs_attr3_leaf_remove(
 				tmp = be16_to_cpu(entry->nameidx);
 				tmp = be16_to_cpu(entry->nameidx);
 		}
 		}
 		ichdr.firstused = tmp;
 		ichdr.firstused = tmp;
-		if (!ichdr.firstused)
-			ichdr.firstused = tmp - XFS_ATTR_LEAF_NAME_ALIGN;
+		ASSERT(ichdr.firstused != 0);
 	} else {
 	} else {
 		ichdr.holes = 1;	/* mark as needing compaction */
 		ichdr.holes = 1;	/* mark as needing compaction */
 	}
 	}